joes 2004/07/01 08:22:56
Modified: . Makefile.am
Log:
apr HEAD now includes doxy tagfiles; we need to add the GENERATE_TAGFILE to
the bottom of the conf file to override their setting. Also simplify
feather.gif dependency.
Revision Changes Path
1.27 +9 -8 httpd-apreq-2/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.am 25 Jun 2004 16:00:45 -0000 1.26
+++ Makefile.am 1 Jul 2004 15:22:56 -0000 1.27
@@ -3,8 +3,8 @@
EXTRA_DIST = LICENSE NOTICE README INSTALL CHANGES FAQ MANIFEST.SKIP
Makefile.PL buildconf build win32 docs
[EMAIL PROTECTED]@ --srcdir`
[EMAIL PROTECTED]@ --srcdir`
-APU_DOX = (cd $(APU_SRCDIR); cat - docs/doxygen.conf | doxygen -)
-APR_DOX = (cd $(APR_SRCDIR); cat - docs/doxygen.conf | doxygen -)
+APU_DOX = (cd $(APU_SRCDIR); cat docs/doxygen.conf - | doxygen -)
+APR_DOX = (cd $(APR_SRCDIR); cat docs/doxygen.conf - | doxygen -)
POD_PREFIX=glue/perl/xsbuilder/Apache
COOKIE_POD=$(POD_PREFIX)/Cookie/Cookie_pod
REQUEST_POD=$(POD_PREFIX)/Request/Request_pod
@@ -45,14 +45,9 @@
docs_clean:
-rm -rf docs
-docs: src env glue build/doxygen.conf apr_tags pod2html feather.gif
+docs: src env glue build/doxygen.conf apr_tags pod2html
docs/html/feather.gif
@PERL@ build/version_check.pl doxygen
doxygen build/doxygen.conf
- cp feather.gif docs/html
-
-feather.gif:
- wget http://httpd.apache.org/docs-2.0/images/feather.gif
-
docs_install: docs
@$(NORMAL_INSTALL)
@@ -70,9 +65,15 @@
apr_tags: docs/apr.tag docs/apu.tag
+docs/html/feather.gif:
+ -mkdir docs
+ -mkdir docs/html
+ (cd docs/html; wget http://httpd.apache.org/docs-2.0/images/feather.gif)
+
docs/apu.tag:
-mkdir docs
echo GENERATE_TAGFILE=`pwd`/docs/apu.tag | $(APU_DOX)
+
docs/apr.tag:
-mkdir docs
echo GENERATE_TAGFILE=`pwd`/docs/apr.tag | $(APR_DOX)
