Better doc build system integration

git-svn-id: https://uriparser.svn.sourceforge.net/svnroot/uriparser/uriparser/trunk@366 119732b9-2324-0410-a8a5-815c10060bbe

5 files changed, 39 insertions, 54 deletions

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 69bd8de..5931161 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1,4 +1,4 @@
-# uriparser Doxyfile for Doxygen 1.4.7

+# Doxyfile for Doxygen 1.4.7

 

 

 

@@ -8,7 +8,7 @@
 ###############################################################

 

 

-PROJECT_NAME = uriparser

+PROJECT_NAME = "@PACKAGE@"

 # 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.

 

 

@@ -16,7 +16,7 @@ PROJECT_NUMBER = "@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 = "..\uriparser-@VERSION@-doc.chm"

+CHM_FILE = "..\@PACKAGE@-@VERSION@-doc.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.

 

 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 62cbcba..1f142d3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,12 +16,28 @@ phony_html_doc :
 	rm -f html/index.*

 	doxygen Doxyfile

 

-EXTRA_DIST = \

-	Doxyfile.in \

-	\

-	Mainpage \

-	\

+URI_DOC_FILES = \

 	html/*.css \

 	html/*.gif \

 	html/*.html \

 	html/*.png

+

+

+## Nested configure hacks

+if CALLED_BY_PARENT

+

+## Make doc get installed

+nobase_nodist_doc_DATA = $(URI_DOC_FILES)

+

+## Kill automake error

+DIST_COMMON = $(DIST_COMMON)

+

+else

+

+## Make Automake not ship package sources

+DIST_COMMON =

+

+## Make doc go into dist when run from doc folder

+EXTRA_DIST = $(URI_DOC_FILES)

+

+endif

diff --git a/doc/bootstrap.sh b/doc/bootstrap.sh
deleted file mode 100755
index e410545..0000000
--- a/doc/bootstrap.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/bash
-CUR=0
-COUNT=3
-
-step() {
-	PERC=$((100 * CUR / COUNT))
-	printf "[%3i%%] %s" ${PERC} "$1"
-	echo
-	CUR=$((CUR + 1))
-}
-
-## Aclocal
-ACLOCAL_VERSION=`aclocal --version | head -1 | grep -o '[^ ]*$'`
-step "aclocal     ${ACLOCAL_VERSION}"
-LIBTOOL_M4=$(dirname $(dirname $(which libtool)))/share/libtool/libtool.m4
-if [ -e ${LIBTOOL_M4} ]; then
-	cp "${LIBTOOL_M4}" acinclude.m4 || exit 1
-fi
-aclocal || exit 1
-
-## Autoconf
-AUTOCONF_VERSION=`autoconf --version | head -1 | grep -o '[^ ]*$'`
-step "autoconf    ${AUTOCONF_VERSION}"
-autoconf || exit 1
-
-## Automake
-AUTOMAKE_VERSION=`automake --version | head -1 | grep -o '[^ ]*$'`
-step "automake    ${AUTOMAKE_VERSION}"
-automake --add-missing --copy || exit 1
-
-step "."
-exit 0
diff --git a/doc/configure.in b/doc/configure.ac
index 0bcd06e..5900b8a 100644
--- a/doc/configure.in
+++ b/doc/configure.ac
@@ -1,8 +1,18 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
 AC_INIT(Doxyfile.in)
+AC_CONFIG_AUX_DIR([../build-aux])
 AM_INIT_AUTOMAKE(uriparser, 0.7.2)
 
+
+## Nested configure hacks
+CALLED_BY_PARENT=0
+AC_ARG_ENABLE(doc, [], [
+	CALLED_BY_PARENT=1
+], [])
+AM_CONDITIONAL(CALLED_BY_PARENT, test x${CALLED_BY_PARENT} = x1)
+
+
 ## Doxygen
 AC_CHECK_PROG(DOXY_CHECK, doxygen, found, missing)
 if test ${DOXY_CHECK} != "found" ; then
@@ -18,18 +28,17 @@ fi
 
 
 ## HTML help
-host_triplet=`../config.guess`
+host_triplet=`${ac_config_guess}`
 if grep cygwin <<<"${host_triplet}" >/dev/null ; then
-    GENERATE_HTMLHELP=YES
+	GENERATE_HTMLHELP=YES
 else
-    GENERATE_HTMLHELP=NO
+	GENERATE_HTMLHELP=NO
 fi
 AC_SUBST(GENERATE_HTMLHELP)
 
 
 AC_CONFIG_FILES([
-    Doxyfile
-    Makefile
+	Doxyfile
+	Makefile
 ])
 AC_OUTPUT
-
diff --git a/doc/release.sh b/doc/release.sh
index 096f238..bc93d2d 100755
--- a/doc/release.sh
+++ b/doc/release.sh
@@ -16,18 +16,10 @@ cd .. || exit 1
 ./bootstrap.sh || exit 1
 cd "${PWD_BACKUP}" || exit 1
 
-## Bootstrap
-step "./bootstrap.sh"
-./bootstrap.sh || exit 1
-
 ## Configure
 step "./configure"
 ./configure || exit 1
 
-## Make
-step "make"
-make || exit 1
-
 ## Make dist
 step "make dist"
 make dist || exit 1