Makefile fixes to get make distcheck passing.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@534143 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 22 insertions, 19 deletions

diff --git a/qpid/cpp/docs/api/Makefile.am b/qpid/cpp/docs/api/Makefile.am
index adc7a5d8b3..121c263a12 100644
--- a/qpid/cpp/docs/api/Makefile.am
+++ b/qpid/cpp/docs/api/Makefile.am
@@ -6,7 +6,7 @@
 # TODO aconway 2007-04-12: html should have a
 # dependency on source/header files.
 
-EXTRA_DIST = html user.doxygen developer.doxygen
+EXTRA_DIST = html user.doxygen developer.doxygen html.timestamp
 
 html: html.timestamp
 
diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am
index 7d2acd7227..c8df4eab6a 100644
--- a/qpid/cpp/docs/man/Makefile.am
+++ b/qpid/cpp/docs/man/Makefile.am
@@ -1,8 +1,8 @@
 dist_man_MANS = qpidd.1
 
-man_aux = $(dist_man_MANS:.1=.x) $(optional_mans:.1=.x)
-EXTRA_DIST = $(man_aux) $(optional_mans)
-MAINTAINERCLEANFILES = $(dist_man_MANS)
+man_aux = $(dist_man_MANS:.1=.x) 
+EXTRA_DIST = $(man_aux) 
+DISTCLEANFILES = $(dist_man_MANS)
 
 dist-hook: $(man_aux)
 
diff --git a/qpid/cpp/gen/Makefile.am b/qpid/cpp/gen/Makefile.am
index 6c20963134..c1f27c8700 100644
--- a/qpid/cpp/gen/Makefile.am
+++ b/qpid/cpp/gen/Makefile.am
@@ -3,11 +3,11 @@
 #
 -include gen-src.mk
 
-BUILT_SOURCES = gen-src.mk qpid/timestamp $(generated_cpp) $(generated_h)
-
 # Distribute the generated sources, since the code generator depends
 # on tools that may not be available in the build environment.
-EXTRA_DIST = $(BUILT_SOURCES) 
+GEN_SRC=$(generated_cpp) $(generated_h) 
+BUILT_SOURCES =  $(GEN_SRC) gen-src.mk
+EXTRA_DIST = $(BUILT_SOURCES)
 
 # Install generated headers
 nobase_include_HEADERS = $(generated_h)
@@ -22,17 +22,24 @@ gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
 spec_dir = $(top_srcdir)/../specs
 spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml
 
-qpid/timestamp $(generated_cpp) $(generated_h): $(spec) $(java_sources) $(cxx_templates) 
+$(GEN_SRC): $(spec) $(java_sources) $(cxx_templates) 
 	mkdir -p qpid/framing
 	cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
 	$(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
 	        -c -o qpid/framing -t $(gentools_dir)/templ.cpp $(spec)
 	touch qpid/timestamp
 
-gen-src.mk: qpid gen-src-mk.sh
+gen-src.mk: $(BUILT_SOURCES) gen-src-mk.sh
 	$(srcdir)/gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
 	mv $@-t $@
 
+else
+# No code generator, we must be in a distribution tree.
+# Copy gen-src.mk from the source dir as make does not look for
+# include files in the VPATH
+gen-src.mk: $(srcdir)/gen-src.mk
+	cp $< $@
+DISTCLEANFILES=gen-src.mk
 endif
 
 maintainer-clean-local:
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 805f8d8e32..f9f241706f 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -60,24 +60,16 @@ CLIENT_TESTS = client_test quick_topictest
 TESTS = run-unit-tests start_broker $(CLIENT_TESTS) python_tests kill_broker daemon_test
 
 EXTRA_DIST =					\
+  $(TESTS)					\
   test_env					\
   topictest					\
-  quick_topictest				\
-  run-unit-tests				\
-  start_broker					\
-  python_tests					\
-  kill_broker					\
   .valgrind.supp				\
   .valgrindrc-default				\
   InProcessBroker.h				\
   MockChannel.h					\
   MockConnectionInputHandler.h			\
   TxMocks.h					\
-  qpid_test_plugin.h				\
-  APRBaseTest.cpp
-
-CLEANFILES=qpidd.log
-MAINTAINERCLEANFILES=gen.mk
+  qpid_test_plugin.h
 
 include gen.mk
 
@@ -123,3 +115,7 @@ check-unit:
 # This is necessary because with two or more identical and simultaneous
 # ltmain invocations, one may corrupt the temporaries of the other.
 .NOTPARALLEL:
+
+CLEANFILES=valgrind.out qpidd.log
+DISTCLEANFILES=.valgrindrc 
+MAINTAINERCLEANFILES=gen.mk