joes 2003/06/28 15:25:08
Modified: . Makefile.am acinclude.m4
build doxygen.conf
src apreq.h
Log:
'%make apr_tags' creates doxygen tags for apr & apr-util
Revision Changes Path
1.10 +10 -1 httpd-apreq-2/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am 15 Jun 2003 05:25:37 -0000 1.9
+++ Makefile.am 28 Jun 2003 22:25:07 -0000 1.10
@@ -1,9 +1,18 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src env t
EXTRA_DIST = INSTALL
[EMAIL PROTECTED]@ --srcdir`
[EMAIL PROTECTED]@ --srcdir`
+APUDOX = (cd $(APUDIR); cat - docs/doxygen.conf | doxygen -)
+APRDOX = (cd $(APRDIR); cat - docs/doxygen.conf | doxygen -)
-docs: src
+docs: src env glue build/doxygen.conf
doxygen build/doxygen.conf
+
+apr_tags:
+ -mkdir docs
+ echo GENERATE_TAGFILE=`pwd`/docs/apu.tag | $(APUDOX)
+ echo GENERATE_TAGFILE=`pwd`/docs/apr.tag | $(APRDOX)
test: lib_test env_test
1.7 +4 -1 httpd-apreq-2/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- acinclude.m4 20 May 2003 20:08:24 -0000 1.6
+++ acinclude.m4 28 Jun 2003 22:25:07 -0000 1.7
@@ -7,10 +7,13 @@
[ --with-perl path to perl executable],
[PERL=$withval],
[PERL="perl"])
-
+ APU_CONFIG=`$APACHE2_APXS -q BINDIR`/apu-config
+ APR_CONFIG=`$APACHE2_APXS -q BINDIR`/apr-config
APACHE2_INCLUDES=`$APACHE2_APXS -q INCLUDEDIR`
APACHE2_MODULES=`$APACHE2_APXS -q LIBEXECDIR`
APACHE2_LIBS=`$APACHE2_APXS -q LIBDIR`
+ AC_SUBST(APU_CONFIG)
+ AC_SUBST(APR_CONFIG)
AC_SUBST(APACHE2_APXS)
AC_SUBST(APACHE2_INCLUDES)
AC_SUBST(APACHE2_MODULES)
1.3 +4 -3 httpd-apreq-2/build/doxygen.conf
Index: doxygen.conf
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/doxygen.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- doxygen.conf 15 Jun 2003 10:33:00 -0000 1.2
+++ doxygen.conf 28 Jun 2003 22:25:07 -0000 1.3
@@ -745,12 +745,13 @@
# The TAGFILES tag can be used to specify one or more tagfiles.
-TAGFILES =
+TAGFILES = docs/apr.tag=http://apr.apache.org/docs/apr \
+ docs/apu.tag=http://apr.apache.org/docs/apr-util
# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
-GENERATE_TAGFILE =
+GENERATE_TAGFILE = docs/apreq.tag
# If the ALLEXTERNALS tag is set to YES all external classes will be listed
# in the class index. If set to NO only the inherited external classes
@@ -762,7 +763,7 @@
# in the modules index. If set to NO, only the current project's groups will
# be listed.
-EXTERNAL_GROUPS = YES
+EXTERNAL_GROUPS = NO
# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
1.30 +13 -0 httpd-apreq-2/src/apreq.h
Index: apreq.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- apreq.h 28 Jun 2003 19:00:45 -0000 1.29
+++ apreq.h 28 Jun 2003 22:25:07 -0000 1.30
@@ -78,6 +78,19 @@
* @verbinclude README
*/
+/**
+ * @page LICENSE
+ * @verbinclude LICENSE
+ */
+/**
+ * @page INSTALL
+ * @verbinclude INSTALL
+ */
+/**
+ * @page CHANGES
+ * @verbinclude CHANGES
+ */
+
/**
* The objects in apreq.h are used in various contexts:
*
