From 049fb4586b172532be49c79b4e56f746cd5954a8 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 8 Nov 2011 20:51:12 +0000 Subject: QPID-3586: Changes for QPID-3464 break cmake build in tar.gz distribution - Added in the new CMake files to EXTRA_DIST in the Makefile.am files so that they get built into the tarballs - Added some cluster test files back into the .../tests/cluster.mk file as they seem to have been dropped by mistake (and having them missing also breaks the cmake build in a similar way) git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1199451 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bindings/qmf/Makefile.am | 2 +- qpid/cpp/bindings/qmf/python/Makefile.am | 2 +- qpid/cpp/bindings/qmf/ruby/Makefile.am | 2 +- qpid/cpp/bindings/qmf2/Makefile.am | 2 +- qpid/cpp/bindings/qmf2/python/Makefile.am | 2 +- qpid/cpp/bindings/qmf2/ruby/Makefile.am | 2 +- qpid/cpp/docs/man/Makefile.am | 2 +- qpid/cpp/src/Makefile.am | 1 + qpid/cpp/src/tests/cluster.mk | 18 ++++++++++-------- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/qpid/cpp/bindings/qmf/Makefile.am b/qpid/cpp/bindings/qmf/Makefile.am index eebb4b94de..dd77ab080c 100644 --- a/qpid/cpp/bindings/qmf/Makefile.am +++ b/qpid/cpp/bindings/qmf/Makefile.am @@ -19,7 +19,7 @@ if HAVE_SWIG -EXTRA_DIST = qmfengine.i +EXTRA_DIST = CMakeLists.txt qmfengine.i SUBDIRS = tests if HAVE_RUBY_DEVEL diff --git a/qpid/cpp/bindings/qmf/python/Makefile.am b/qpid/cpp/bindings/qmf/python/Makefile.am index 8abad32959..b5408f51fc 100644 --- a/qpid/cpp/bindings/qmf/python/Makefile.am +++ b/qpid/cpp/bindings/qmf/python/Makefile.am @@ -25,7 +25,7 @@ generated_file_list = \ qmfengine.cpp \ qmfengine.py -EXTRA_DIST = python.i +EXTRA_DIST = CMakeLists.txt python.i BUILT_SOURCES = $(generated_file_list) SWIG_FLAGS = -w362,401 diff --git a/qpid/cpp/bindings/qmf/ruby/Makefile.am b/qpid/cpp/bindings/qmf/ruby/Makefile.am index de8c4d10d5..1c7f67edb3 100644 --- a/qpid/cpp/bindings/qmf/ruby/Makefile.am +++ b/qpid/cpp/bindings/qmf/ruby/Makefile.am @@ -21,7 +21,7 @@ if HAVE_RUBY_DEVEL INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -EXTRA_DIST = ruby.i +EXTRA_DIST = CMakeLists.txt ruby.i BUILT_SOURCES = qmfengine.cpp SWIG_FLAGS = -w362,401 diff --git a/qpid/cpp/bindings/qmf2/Makefile.am b/qpid/cpp/bindings/qmf2/Makefile.am index 52b1bbd457..9a03a5cd21 100644 --- a/qpid/cpp/bindings/qmf2/Makefile.am +++ b/qpid/cpp/bindings/qmf2/Makefile.am @@ -19,7 +19,7 @@ if HAVE_SWIG -EXTRA_DIST = qmf2.i +EXTRA_DIST = CMakeLists.txt qmf2.i SUBDIRS = examples/cpp if HAVE_RUBY_DEVEL diff --git a/qpid/cpp/bindings/qmf2/python/Makefile.am b/qpid/cpp/bindings/qmf2/python/Makefile.am index 3dc04e832f..bafa5dd413 100644 --- a/qpid/cpp/bindings/qmf2/python/Makefile.am +++ b/qpid/cpp/bindings/qmf2/python/Makefile.am @@ -25,7 +25,7 @@ generated_file_list = \ cqmf2.cpp \ cqmf2.py -EXTRA_DIST = python.i +EXTRA_DIST = CMakeLists.txt python.i BUILT_SOURCES = $(generated_file_list) SWIG_FLAGS = -w362,401 diff --git a/qpid/cpp/bindings/qmf2/ruby/Makefile.am b/qpid/cpp/bindings/qmf2/ruby/Makefile.am index 97bbc6f385..a03bd6d5e6 100644 --- a/qpid/cpp/bindings/qmf2/ruby/Makefile.am +++ b/qpid/cpp/bindings/qmf2/ruby/Makefile.am @@ -21,7 +21,7 @@ if HAVE_RUBY_DEVEL INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES) -EXTRA_DIST = ruby.i +EXTRA_DIST = CMakeLists.txt ruby.i BUILT_SOURCES = cqmf2.cpp SWIG_FLAGS = -w362,401 diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am index b821568f81..50b5630992 100644 --- a/qpid/cpp/docs/man/Makefile.am +++ b/qpid/cpp/docs/man/Makefile.am @@ -38,7 +38,7 @@ dist_man_MANS = qpidd.1 man_aux = $(dist_man_MANS:.1=.x) -EXTRA_DIST = $(man_aux) generate_manpage groffify_options.sed groffify_template.sed +EXTRA_DIST = $(man_aux) CMakeLists.txt generate_manpage groffify_options.sed groffify_template.sed DISTCLEANFILES = $(dist_man_MANS) CLEANFILES=qpidd.1 diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index e87cd3b4e0..1448a8a52f 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -288,6 +288,7 @@ EXTRA_DIST +=\ ssl.cmake \ managementgen.cmake \ rubygen.cmake \ + versions.cmake \ $(rgen_amqp_0_10_srcs) \ qpid/amqp_0_10/apply.h \ qpid/amqp_0_10/built_in_types.h \ diff --git a/qpid/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk index 7d17dd7bde..c4216cbd3d 100644 --- a/qpid/cpp/src/tests/cluster.mk +++ b/qpid/cpp/src/tests/cluster.mk @@ -83,14 +83,16 @@ LONG_TESTS += \ qpidtest_PROGRAMS += cluster_test cluster_test_SOURCES = \ - cluster_test.cpp \ - unit_test.cpp \ - ClusterFixture.cpp \ - ClusterFixture.h \ - ForkedBroker.h \ - ForkedBroker.cpp \ - PartialFailure.cpp \ - ClusterFailover.cpp + cluster_test.cpp \ + unit_test.cpp \ + ClusterFixture.cpp \ + ClusterFixture.h \ + ForkedBroker.h \ + ForkedBroker.cpp \ + PartialFailure.cpp \ + ClusterFailover.cpp \ + InitialStatusMap.cpp \ + StoreStatus.cpp cluster_test_LDADD=$(lib_client) $(lib_broker) ../cluster.la -lboost_unit_test_framework -- cgit v1.2.1