From ce896aa8ee8d910db26abbe1e15930e8ca8735b4 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 7 Nov 2011 20:56:53 +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/trunk/qpid@1198929 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/bindings/qmf/Makefile.am | 2 +- cpp/bindings/qmf/python/Makefile.am | 2 +- cpp/bindings/qmf/ruby/Makefile.am | 2 +- cpp/bindings/qmf2/Makefile.am | 2 +- cpp/bindings/qmf2/python/Makefile.am | 2 +- cpp/bindings/qmf2/ruby/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'cpp/bindings') diff --git a/cpp/bindings/qmf/Makefile.am b/cpp/bindings/qmf/Makefile.am index eebb4b94de..dd77ab080c 100644 --- a/cpp/bindings/qmf/Makefile.am +++ b/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/cpp/bindings/qmf/python/Makefile.am b/cpp/bindings/qmf/python/Makefile.am index 37efe59872..bcef8c6b53 100644 --- a/cpp/bindings/qmf/python/Makefile.am +++ b/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/cpp/bindings/qmf/ruby/Makefile.am b/cpp/bindings/qmf/ruby/Makefile.am index de8c4d10d5..1c7f67edb3 100644 --- a/cpp/bindings/qmf/ruby/Makefile.am +++ b/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/cpp/bindings/qmf2/Makefile.am b/cpp/bindings/qmf2/Makefile.am index 52b1bbd457..9a03a5cd21 100644 --- a/cpp/bindings/qmf2/Makefile.am +++ b/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/cpp/bindings/qmf2/python/Makefile.am b/cpp/bindings/qmf2/python/Makefile.am index e33e6e00d1..591c1408c0 100644 --- a/cpp/bindings/qmf2/python/Makefile.am +++ b/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/cpp/bindings/qmf2/ruby/Makefile.am b/cpp/bindings/qmf2/ruby/Makefile.am index 97bbc6f385..a03bd6d5e6 100644 --- a/cpp/bindings/qmf2/ruby/Makefile.am +++ b/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 -- cgit v1.2.1