Author: aconway
Date: Tue May 1 09:10:42 2007
New Revision: 534143
URL: http://svn.apache.org/viewvc?view=rev&rev=534143
Log:
Makefile fixes to get make distcheck passing.
Modified:
incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am
incubator/qpid/trunk/qpid/cpp/gen/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
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=534143&r1=534142&r2=534143
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am Tue May 1 09:10:42 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am?view=diff&rev=534143&r1=534142&r2=534143
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am Tue May 1 09:10:42 2007
@@ -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)
Modified: incubator/qpid/trunk/qpid/cpp/gen/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gen/Makefile.am?view=diff&rev=534143&r1=534142&r2=534143
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gen/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/gen/Makefile.am Tue May 1 09:10:42 2007
@@ -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 @@
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) > [EMAIL
PROTECTED]
mv [EMAIL PROTECTED] $@
+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:
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?view=diff&rev=534143&r1=534142&r2=534143
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Tue May 1 09:10:42 2007
@@ -60,24 +60,16 @@
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 @@
# 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
