* 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@527325 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 32 insertions, 30 deletions

diff --git a/qpid/cpp/docs/api/Makefile.am b/qpid/cpp/docs/api/Makefile.am
index 2b05622d2d..cd54e20d60 100644
--- a/qpid/cpp/docs/api/Makefile.am
+++ b/qpid/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 
diff --git a/qpid/cpp/docs/api/developer.doxygen b/qpid/cpp/docs/api/developer.doxygen.in
index 46661c14ca..b267b12b90 100644
--- a/qpid/cpp/docs/api/developer.doxygen
+++ b/qpid/cpp/docs/api/developer.doxygen.in
@@ -464,7 +464,7 @@ WARN_LOGFILE           = doxygen.log
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT      		= ../../lib ../../gen ../../src
+INPUT      		= @abs_top_srcdir@/src
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -484,7 +484,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                = test
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
diff --git a/qpid/cpp/docs/api/doxygen.mk b/qpid/cpp/docs/api/doxygen.mk
deleted file mode 100644
index 8429eb42b7..0000000000
--- a/qpid/cpp/docs/api/doxygen.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-include doxygen.deps
-
-html: user.doxygen 
-	doxygen user.doxygen
-	touch $@
-
-html-dev: developer.doxygen
-	doxygen developer.doxygen
-	touch $@
diff --git a/qpid/cpp/docs/api/doxygen_mk.sh b/qpid/cpp/docs/api/doxygen_mk.sh
new file mode 100755
index 0000000000..ba65531e04
--- /dev/null
+++ b/qpid/cpp/docs/api/doxygen_mk.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Generate makefile for doxygen with dependencies on source files.
+# 
+
+deps() {
+    find "$top_srcdir/src" -name "$2" -exec echo -ne '\\\n  {} ' \;
+    echo ; echo
+}
+
+cat <<EOF
+html: user.doxygen
+	doxygen $srcdir/user.doxygen
+html-dev: developer.doxygen
+	doxygen $srcdir/developer.doxygen
+EOF
+
+deps "html: " "*.h"
+deps "html-dev: html " "*.cpp"
diff --git a/qpid/cpp/docs/api/user.doxygen b/qpid/cpp/docs/api/user.doxygen.in
index 0d92dc283b..9084cbd679 100644
--- a/qpid/cpp/docs/api/user.doxygen
+++ b/qpid/cpp/docs/api/user.doxygen.in
@@ -467,7 +467,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT      		= ../../lib/common ../../lib/client ../../gen
+INPUT      		= @abs_top_srcdir@/src
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -487,7 +487,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                = test
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded