Merge branch 'release/debian/0.9.3-1'debian/0.9.3-1

6 files changed, 96 insertions, 527 deletions

diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..ba9a3b7
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,5 @@
+/Doxyfile
+/html
+/release.sh
+/uriparser-*.qch
+/uriparser-*-doc.zip
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index dd0926f..da4132f 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1,12 +1,12 @@
 # Doxyfile for Doxygen 1.5.7

 

 # .qhp output

-GENERATE_QHP = yes

+GENERATE_QHP = @GENERATE_QHP@

 QHP_NAMESPACE = "io.github.uriparser"

-QHP_VIRTUAL_FOLDER = "uriparser-@VERSION@"

+QHP_VIRTUAL_FOLDER = "uriparser-@PROJECT_VERSION@"

 

 # .qch output

-QCH_FILE = "../@PACKAGE@-@VERSION@.qch"

+QCH_FILE = "../@PROJECT_NAME@-@PROJECT_VERSION@.qch"

 QHG_LOCATION = "@QHG_LOCATION@"

 

 

@@ -19,11 +19,11 @@ PROJECT_NAME = "uriparser"
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded by double-quotes) that should identify the project for which the documentation is generated. This name is used in the title of most generated pages and in a few other places.

 

 

-PROJECT_NUMBER = "@VERSION@"

+PROJECT_NUMBER = "@PROJECT_VERSION@"

 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This could be handy for archiving the generated documentation or if some version control system is used.

 

 

-CHM_FILE = "..\@PACKAGE@-@VERSION@.chm"

+CHM_FILE = "..\@PROJECT_NAME@-@PROJECT_VERSION@.chm"

 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can be used to specify the file name of the resulting .chm file. You can add a path in front of the file if the result should not be written to the html output directory.

 

 

@@ -280,7 +280,7 @@ WARN_FORMAT = "WARNING: $text ($line, $file)"
 ###############################################################

 

 

-INPUT = @ac_abs_confdir@/include @ac_abs_confdir@/doc/Mainpage.txt

+INPUT = @CMAKE_CURRENT_SOURCE_DIR@/include @CMAKE_CURRENT_SOURCE_DIR@/doc/Mainpage.txt

 # The INPUT tag is used to specify the files and/or directories that contain documented source files. You may enter file names like myfile.cpp or directories like /usr/src/myproject. Separate the files or directories with spaces.

 #

 # Note: If this tag is empty the current directory is searched.

@@ -346,7 +346,7 @@ RECURSIVE = YES
 # The IMAGE_PATH tag can be used to specify one or more files or directories that contain images that are to be included in the documentation (see the \image command).

 

 

-INPUT_FILTER = "bash @ac_abs_confdir@/doc/preprocess.sh"

+INPUT_FILTER = "bash @CMAKE_CURRENT_SOURCE_DIR@/doc/preprocess.sh"

 # The INPUT_FILTER tag can be used to specify a program that doxygen should invoke to filter for each input file. Doxygen will invoke the filter program by executing (via popen()) the command:

 #

 # <filter> <input-file>

@@ -497,7 +497,7 @@ GENERATE_HTMLHELP = @GENERATE_HTMLHELP@
 # The HTML Help Workshop contains a compiler that can convert all HTML output generated by doxygen into a single compressed HTML file (.chm). Compressed HTML files are now used as the Windows 98 help format, and will replace the old Windows help format (.hlp) on all Windows platforms in the future. Compressed HTML files also contain an index, a table of contents, and you can search for words in the documentation. The HTML workshop also contains a viewer for compressed HTML files.

 

 

-HHC_LOCATION = ../hhc.exe

+HHC_LOCATION = "@HTML_HELP_COMPILER@"

 # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can be used to specify the location (absolute path including file name) of the HTML help compiler (hhc.exe). If non empty doxygen will try to run the HTML help compiler on the generated index.hhp.

 

 

@@ -746,7 +746,7 @@ SEARCH_INCLUDES = YES
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files in the INCLUDE_PATH (see below) will be searched if a #include is found.

 

 

-INCLUDE_PATH = @ac_abs_confdir@/include

+INCLUDE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/include

 # The INCLUDE_PATH tag can be used to specify one or more directories that contain include files that are not input files but should be processed by the preprocessor.

 

 

diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 012f0bc..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-## Build doc files
-all-local: html/index.html
-
-html/index.html: $(srcdir)/../include/uriparser/*.h \
-		$(srcdir)/../src/*.c \
-		$(srcdir)/../src/*.h \
-		$(srcdir)/Mainpage.txt
-	rm -Rf "$(builddir)/html"
-	doxygen Doxyfile
-	touch html/index.html
-
-
-## Clean doc files
-clean-local:
-	rm -Rf "$(builddir)/html"
-	rm -f *.qch
-
-
-## Clean configure files
-distclean-local:
-	rm -f config.{log,status} release.sh Doxyfile
-
-
-## Install doc files
-install-data-local:
-	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/search"  ## Didn't work with installdirs-local
-	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
-	$(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/"
-	-$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
-
-
-## Uninstall doc files
-uninstall-local:
-	rm -Rf "$(DESTDIR)$(docdir)/html"
-	rm -f "$(DESTDIR)$(docdir)"/*.qch
diff --git a/doc/Makefile.in b/doc/Makefile.in
deleted file mode 100644
index 801fbe3..0000000
--- a/doc/Makefile.in
+++ /dev/null
@@ -1,481 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = doc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = Doxyfile release.sh
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.in \
-	$(srcdir)/release.sh.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXY_CHECK = @DOXY_CHECK@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GENERATE_HTMLHELP = @GENERATE_HTMLHELP@
-GRAPHVIZ_CHECK = @GRAPHVIZ_CHECK@
-GREP = @GREP@
-GTEST_CFLAGS = @GTEST_CFLAGS@
-GTEST_LIBS = @GTEST_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-QHG_LOCATION = @QHG_LOCATION@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_abs_confdir = @ac_abs_confdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign doc/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-release.sh: $(top_builddir)/config.status $(srcdir)/release.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-local
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local cscopelist-am ctags-am distclean \
-	distclean-generic distclean-libtool distclean-local distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am uninstall-local
-
-.PRECIOUS: Makefile
-
-all-local: html/index.html
-
-html/index.html: $(srcdir)/../include/uriparser/*.h \
-		$(srcdir)/../src/*.c \
-		$(srcdir)/../src/*.h \
-		$(srcdir)/Mainpage.txt
-	rm -Rf "$(builddir)/html"
-	doxygen Doxyfile
-	touch html/index.html
-
-clean-local:
-	rm -Rf "$(builddir)/html"
-	rm -f *.qch
-
-distclean-local:
-	rm -f config.{log,status} release.sh Doxyfile
-
-install-data-local:
-	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/search"  ## Didn't work with installdirs-local
-	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
-	$(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/"
-	-$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
-
-uninstall-local:
-	rm -Rf "$(DESTDIR)$(docdir)/html"
-	rm -f "$(DESTDIR)$(docdir)"/*.qch
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/doc/release.sh.in b/doc/release.sh.in
index 70a52b4..6a7d09a 100755
--- a/doc/release.sh.in
+++ b/doc/release.sh.in
@@ -2,14 +2,14 @@
 (
 cd $(dirname $(which "$0")) || exit 1
 
-distdir="@PACKAGE@-@VERSION@-doc"
+distdir="@PROJECT_NAME@-@PROJECT_VERSION@-doc"
 [ -z $MAKE ] && MAKE=make
 
 # Clean up
 rm -Rf "${distdir}" "${distdir}.zip"
 
 # Generate
-"${MAKE}" || exit 1
+"${MAKE}" -C .. doc || exit 1
 
 # Copy
 mkdir -p "${distdir}/html/search"
diff --git a/doc/rfc3986_grammar_only.txt b/doc/rfc3986_grammar_only.txt
new file mode 100644
index 0000000..e8b8d08
--- /dev/null
+++ b/doc/rfc3986_grammar_only.txt
@@ -0,0 +1,80 @@
+URI           = scheme ":" hier-part [ "?" query ] [ "#" fragment ]

+

+hier-part     = "//" authority path-abempty

+              / path-absolute

+              / path-rootless

+              / path-empty

+

+URI-reference = URI / relative-ref

+

+absolute-URI  = scheme ":" hier-part [ "?" query ]

+

+relative-ref  = relative-part [ "?" query ] [ "#" fragment ]

+

+relative-part = "//" authority path-abempty

+              / path-absolute

+              / path-noscheme

+              / path-empty

+

+scheme        = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )

+

+authority     = [ userinfo "@" ] host [ ":" port ]

+userinfo      = *( unreserved / pct-encoded / sub-delims / ":" )

+host          = IP-literal / IPv4address / reg-name

+port          = *DIGIT

+

+IP-literal    = "[" ( IPv6address / IPvFuture  ) "]"

+

+IPvFuture     = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )

+

+IPv6address   =                            6( h16 ":" ) ls32

+              /                       "::" 5( h16 ":" ) ls32

+              / [               h16 ] "::" 4( h16 ":" ) ls32

+              / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32

+              / [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32

+              / [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32

+              / [ *4( h16 ":" ) h16 ] "::"              ls32

+              / [ *5( h16 ":" ) h16 ] "::"              h16

+              / [ *6( h16 ":" ) h16 ] "::"

+

+h16           = 1*4HEXDIG

+ls32          = ( h16 ":" h16 ) / IPv4address

+IPv4address   = dec-octet "." dec-octet "." dec-octet "." dec-octet

+dec-octet     = DIGIT                 ; 0-9

+              / %x31-39 DIGIT         ; 10-99

+              / "1" 2DIGIT            ; 100-199

+              / "2" %x30-34 DIGIT     ; 200-249

+              / "25" %x30-35          ; 250-255

+

+reg-name      = *( unreserved / pct-encoded / sub-delims )

+

+path          = path-abempty    ; begins with "/" or is empty

+              / path-absolute   ; begins with "/" but not "//"

+              / path-noscheme   ; begins with a non-colon segment

+              / path-rootless   ; begins with a segment

+              / path-empty      ; zero characters

+

+path-abempty  = *( "/" segment )

+path-absolute = "/" [ segment-nz *( "/" segment ) ]

+path-noscheme = segment-nz-nc *( "/" segment )

+path-rootless = segment-nz *( "/" segment )

+path-empty    = 0<pchar>

+

+segment       = *pchar

+segment-nz    = 1*pchar

+segment-nz-nc = 1*( unreserved / pct-encoded / sub-delims / "@" )

+              ; non-zero-length segment without any colon ":"

+

+pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"

+

+query         = *( pchar / "/" / "?" )

+

+fragment      = *( pchar / "/" / "?" )

+

+pct-encoded   = "%" HEXDIG HEXDIG

+

+unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"

+reserved      = gen-delims / sub-delims

+gen-delims    = ":" / "/" / "?" / "#" / "[" / "]" / "@"

+sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"

+              / "*" / "+" / "," / ";" / "="