summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2012-10-22 16:49:14 +0000
committerAndrew Stitcher <astitcher@apache.org>2012-10-22 16:49:14 +0000
commitdc24715bfb243ddcc71009776dd6b7e21986b75a (patch)
tree77a0e835a2e5d476310e8a766ef4d459294be7a1
parentfe3d7394b36efd5b278e222f176a5320c74c4b12 (diff)
downloadqpid-python-dc24715bfb243ddcc71009776dd6b7e21986b75a.tar.gz
NO-JIRA: Add files missed from EXTRA_DISTS from both the recent amqp 1.0 work and the recent cmake work
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1400948 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/Makefile.am4
-rw-r--r--qpid/cpp/bindings/qmf/Makefile.am2
-rw-r--r--qpid/cpp/bindings/qmf2/Makefile.am2
-rw-r--r--qpid/cpp/bindings/qpid/Makefile.am2
-rw-r--r--qpid/cpp/src/Makefile.am9
5 files changed, 13 insertions, 6 deletions
diff --git a/qpid/cpp/Makefile.am b/qpid/cpp/Makefile.am
index 9f4b8e2082..8a06948c3e 100644
--- a/qpid/cpp/Makefile.am
+++ b/qpid/cpp/Makefile.am
@@ -25,8 +25,8 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
LICENSE NOTICE README.txt SSL RELEASE_NOTES DESIGN \
xml/cluster.xml INSTALL-WINDOWS CMakeLists.txt BuildInstallSettings.cmake \
- packaging/NSIS QPID_VERSION.txt bindings/swig_python_typemaps.i \
- bindings/swig_ruby_typemaps.i bindings/swig_perl_typemaps.i
+ packaging/NSIS QPID_VERSION.txt bindings/CMakeLists.txt \
+ bindings/swig_python_typemaps.i bindings/swig_ruby_typemaps.i bindings/swig_perl_typemaps.i
SUBDIRS = managementgen etc src docs/api docs/man examples bindings/qmf bindings/qpid bindings/qmf2
diff --git a/qpid/cpp/bindings/qmf/Makefile.am b/qpid/cpp/bindings/qmf/Makefile.am
index dd77ab080c..eebb4b94de 100644
--- a/qpid/cpp/bindings/qmf/Makefile.am
+++ b/qpid/cpp/bindings/qmf/Makefile.am
@@ -19,7 +19,7 @@
if HAVE_SWIG
-EXTRA_DIST = CMakeLists.txt qmfengine.i
+EXTRA_DIST = qmfengine.i
SUBDIRS = tests
if HAVE_RUBY_DEVEL
diff --git a/qpid/cpp/bindings/qmf2/Makefile.am b/qpid/cpp/bindings/qmf2/Makefile.am
index 9a03a5cd21..52b1bbd457 100644
--- a/qpid/cpp/bindings/qmf2/Makefile.am
+++ b/qpid/cpp/bindings/qmf2/Makefile.am
@@ -19,7 +19,7 @@
if HAVE_SWIG
-EXTRA_DIST = CMakeLists.txt qmf2.i
+EXTRA_DIST = qmf2.i
SUBDIRS = examples/cpp
if HAVE_RUBY_DEVEL
diff --git a/qpid/cpp/bindings/qpid/Makefile.am b/qpid/cpp/bindings/qpid/Makefile.am
index ae81696f27..96e2a58414 100644
--- a/qpid/cpp/bindings/qpid/Makefile.am
+++ b/qpid/cpp/bindings/qpid/Makefile.am
@@ -21,7 +21,7 @@ SUBDIRS = dotnet
if HAVE_SWIG
-EXTRA_DIST = CMakeLists.txt qpid.i
+EXTRA_DIST = qpid.i
if HAVE_RUBY_DEVEL
SUBDIRS += ruby
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index d166e412e2..8149ea218b 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -292,6 +292,7 @@ endif
EXTRA_DIST +=\
CMakeLists.txt \
config.h.cmake \
+ amqp.cmake \
rdma.cmake \
ssl.cmake \
managementgen.cmake \
@@ -515,12 +516,17 @@ libqpidcommon_la_SOURCES += \
qpid/amqp_0_10/Codecs.cpp \
qpid/amqp/CharSequence.h \
qpid/amqp/CharSequence.cpp \
+ qpid/amqp/Codec.h \
+ qpid/amqp/Constructor.h \
qpid/amqp/Decoder.h \
qpid/amqp/Decoder.cpp \
qpid/amqp/Descriptor.h \
qpid/amqp/Descriptor.cpp \
+ qpid/amqp/descriptors.h \
qpid/amqp/Encoder.h \
qpid/amqp/Encoder.cpp \
+ qpid/amqp/ListReader.h \
+ qpid/amqp/LoggingReader.h \
qpid/amqp/MessageEncoder.h \
qpid/amqp/MessageEncoder.cpp \
qpid/amqp/MessageId.h \
@@ -533,7 +539,8 @@ libqpidcommon_la_SOURCES += \
qpid/amqp/SaslClient.h \
qpid/amqp/SaslClient.cpp \
qpid/amqp/SaslServer.h \
- qpid/amqp/SaslServer.cpp
+ qpid/amqp/SaslServer.cpp \
+ qpid/amqp/typecodes.h
#libqpidcommon is not really the 'right' place for the Transport
#interface, which is only used in 1.0 impl of messaging API, but this