Author: aconway
Date: Fri Mar 30 13:14:10 2007
New Revision: 524260
URL: http://svn.apache.org/viewvc?view=rev&rev=524260
Log:
Fixed autmake $wildcard warnings, added html-dev to generate full doxygen for
developers (slow!).
Added:
incubator/qpid/trunk/qpid/cpp/docs/api/doxygen.mk
Modified:
incubator/qpid/trunk/qpid/cpp/docs/api/ (props changed)
incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen
Propchange: incubator/qpid/trunk/qpid/cpp/docs/api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 30 13:14:10 2007
@@ -3,3 +3,5 @@
doxygen.tstamp
html
dev
+html-dev
+doxygen.deps
Modified: incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am?view=diff&rev=524260&r1=524259&r2=524260
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am Fri Mar 30 13:14:10 2007
@@ -1,21 +1,30 @@
-html: doxygen.tstamp
+#
+# Run doxygen to generate HTML doc.
+# Generate dependency files so its rebuilt only when needed.
+#
+
+EXTRA_DIST = html user.doxygen
dist-hook: html
-EXTRA_DIST = \
- html \
- user.doxygen
-
-SOURCES = \
- $(wildcard $(top_srcdir)/gen/*.h) \
- $(wildcard $(top_srcdir)/lib/common/*.h) \
- $(wildcard $(top_srcdir)/lib/common/sys/*.h) \
- $(wildcard $(top_srcdir)/lib/common/framing/*.h) \
- $(wildcard $(top_srcdir)/lib/client/*.h)
-
-doxygen.tstamp: user.doxygen $(SOURCES)
- doxygen $(srcdir)/user.doxygen
- touch $@
+html: doxygen.mk
+ make -f doxygen.mk $@
+
+html-dev: doxygen.mk
+ make -f doxygen.mk $@
+
+doxygen.mk: doxygen.deps
+
+doxygen.deps: force
+ echo "html: \\" >> [EMAIL PROTECTED]
+ find $(top_srcdir) -name "*.h" -exec echo " {} \\" \; >> [EMAIL
PROTECTED]
+ echo >> [EMAIL PROTECTED]
+ echo "html-dev: html\\" >> [EMAIL PROTECTED]
+ find $(top_srcdir) -name "*.cpp" -exec echo " {} \\" \; >> [EMAIL
PROTECTED]
+ echo >> [EMAIL PROTECTED]
+ mv [EMAIL PROTECTED] $@
+
+force:
clean-local:
- rm -rf docs.tstamp html man latex doxygen.tstamp xml
+ rm -rf html html-dev *.deps
Modified: incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen?view=diff&rev=524260&r1=524259&r2=524260
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen Fri Mar 30
13:14:10 2007
@@ -635,7 +635,7 @@
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
-HTML_OUTPUT = html
+HTML_OUTPUT = html-dev
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
Added: incubator/qpid/trunk/qpid/cpp/docs/api/doxygen.mk
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/doxygen.mk?view=auto&rev=524260
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/doxygen.mk (added)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/doxygen.mk Fri Mar 30 13:14:10 2007
@@ -0,0 +1,9 @@
+include doxygen.deps
+
+html: user.doxygen
+ doxygen user.doxygen
+ touch $@
+
+html-dev: developer.doxygen
+ doxygen developer.doxygen
+ touch $@
