From 842a09455d5d243ca71088ec999e319d761df8fb Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 10 Apr 2007 22:36:12 +0000 Subject: * docs/api/*: Fixed API doc generation to work with VPATH builds. * src/Makefile.am: - Added missing .h files in distribution. * src & tests Makefile.am: - Made generated .mk fragments maintaner-clean, not distclean, otherwise distclean followed by a VPATH build fails. * cpp/src/tests/quick_topictest: cat error log on failure. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@527325 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/docs/api/Makefile.am | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'cpp/docs/api/Makefile.am') diff --git a/cpp/docs/api/Makefile.am b/cpp/docs/api/Makefile.am index 2b05622d2d..cd54e20d60 100644 --- a/cpp/docs/api/Makefile.am +++ b/cpp/docs/api/Makefile.am @@ -3,28 +3,20 @@ # Generate dependency files so its rebuilt only when needed. # -EXTRA_DIST = html user.doxygen +EXTRA_DIST = html user.doxygen developer.doxygen dist-hook: html -html: doxygen.mk - make -f doxygen.mk $@ +src=$(top_srcdir)/src -html-dev: doxygen.mk - make -f doxygen.mk $@ +headers: $(src)/*.h $(src)/*/*.h $(src)/*/*/*.h +sources: $(src)/*.cpp $(src)/*/*.cpp $(src)/*/*/*.cpp -doxygen.mk: doxygen.deps +html: headers user.doxygen + doxygen $(srcdir)/user.doxygen -doxygen.deps: force - echo "html: \\" >> $@-t - find $(top_srcdir) -name "*.h" -exec echo " {} \\" \; >> $@-t - echo >> $@-t - echo "html-dev: html\\" >> $@-t - find $(top_srcdir) -name "*.cpp" -exec echo " {} \\" \; >> $@-t - echo >> $@-t - mv $@-t $@ - -force: +html-dev: headers sources developer.doxygen + doxygen $(srcdir)/developer.doxygen clean-local: - rm -rf html html-dev *.deps + rm -rf html html-dev -- cgit v1.2.1