summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-12-19 21:21:53 +0000
committerAlan Conway <aconway@apache.org>2012-12-19 21:21:53 +0000
commite01df645b4e6604b9cfa0b43ad2c155a43dd05ec (patch)
tree532f8f60e19f019068338b18800218db11e3e557 /cpp
parent06d5b32fab575432a31d764e02bbc904a133f6df (diff)
downloadqpid-python-e01df645b4e6604b9cfa0b43ad2c155a43dd05ec.tar.gz
QPID-4207: Fix distcheck errors for swig .i files.
Introduced in r1414294: "QPID-4207 : in Relocated all swig .i files to the include directory." The new Makefile.am were set up to distribute the files from the new location but the old Makefile.am were not updated to remove the EXTRA_DIST entries for the old locations. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1424117 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/bindings/qmf/Makefile.am1
-rw-r--r--cpp/bindings/qmf2/Makefile.am1
-rw-r--r--cpp/bindings/qpid/Makefile.am4
3 files changed, 1 insertions, 5 deletions
diff --git a/cpp/bindings/qmf/Makefile.am b/cpp/bindings/qmf/Makefile.am
index eebb4b94de..ee4ff1d3c1 100644
--- a/cpp/bindings/qmf/Makefile.am
+++ b/cpp/bindings/qmf/Makefile.am
@@ -19,7 +19,6 @@
if HAVE_SWIG
-EXTRA_DIST = qmfengine.i
SUBDIRS = tests
if HAVE_RUBY_DEVEL
diff --git a/cpp/bindings/qmf2/Makefile.am b/cpp/bindings/qmf2/Makefile.am
index 52b1bbd457..0f50e757a2 100644
--- a/cpp/bindings/qmf2/Makefile.am
+++ b/cpp/bindings/qmf2/Makefile.am
@@ -19,7 +19,6 @@
if HAVE_SWIG
-EXTRA_DIST = qmf2.i
SUBDIRS = examples/cpp
if HAVE_RUBY_DEVEL
diff --git a/cpp/bindings/qpid/Makefile.am b/cpp/bindings/qpid/Makefile.am
index 77eba6a524..93510ad46d 100644
--- a/cpp/bindings/qpid/Makefile.am
+++ b/cpp/bindings/qpid/Makefile.am
@@ -21,8 +21,6 @@ SUBDIRS = dotnet
if HAVE_SWIG
-EXTRA_DIST = CMakeLists.txt qpid.i
-
if HAVE_RUBY_DEVEL
SUBDIRS += ruby
endif
@@ -35,7 +33,7 @@ if HAVE_PERL_DEVEL
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC)
-EXTRA_DIST += perl/perl.i perl/CMakeLists.txt
+EXTRA_DIST = perl/perl.i perl/CMakeLists.txt
BUILT_SOURCES = perl/cqpid_perl.cpp
SWIG_FLAGS = -w362,401