summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2012-02-22 21:29:07 +0000
committerAndrew Stitcher <astitcher@apache.org>2012-02-22 21:29:07 +0000
commit779fa08b0bdc26e164a5e9c1478c83722e31a593 (patch)
tree4e85af538c4fb67ab83921bf60799e69dc9d4745
parent9ffe3de07d0128c69e6cb9910bcf54e763225b46 (diff)
downloadqpid-python-779fa08b0bdc26e164a5e9c1478c83722e31a593.tar.gz
QPID-3864: 0.16 release tasks
- Some more files missed from distlists - File checked into the wrong place initially git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292518 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/bindings/qpid/Makefile.am2
-rw-r--r--qpid/cpp/src/Makefile.am1
-rw-r--r--qpid/cpp/src/qmf.mk1
-rw-r--r--qpid/cpp/src/qpid/sys/MemStat.h (renamed from qpid/cpp/include/qpid/sys/MemStat.h)0
4 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/bindings/qpid/Makefile.am b/qpid/cpp/bindings/qpid/Makefile.am
index eaf45c2076..ae81696f27 100644
--- a/qpid/cpp/bindings/qpid/Makefile.am
+++ b/qpid/cpp/bindings/qpid/Makefile.am
@@ -35,7 +35,7 @@ if HAVE_PERL_DEVEL
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC)
-EXTRA_DIST += perl/perl.i
+EXTRA_DIST += perl/perl.i perl/CMakeLists.txt
BUILT_SOURCES = perl/cqpid_perl.cpp
SWIG_FLAGS = -w362,401
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index a954f28577..bdaf40b073 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -485,6 +485,7 @@ libqpidcommon_la_SOURCES += \
qpid/sys/Fork.h \
qpid/sys/LockFile.h \
qpid/sys/LockPtr.h \
+ qpid/sys/MemStat.h \
qpid/sys/OutputControl.h \
qpid/sys/OutputTask.h \
qpid/sys/PipeHandle.h \
diff --git a/qpid/cpp/src/qmf.mk b/qpid/cpp/src/qmf.mk
index 95d3d5c9b0..9b5df6c808 100644
--- a/qpid/cpp/src/qmf.mk
+++ b/qpid/cpp/src/qmf.mk
@@ -96,6 +96,7 @@ libqmf2_la_SOURCES = \
qmf/AgentSessionImpl.h \
qmf/AgentSubscription.cpp \
qmf/AgentSubscription.h \
+ qmf/BrokerImportExport.h \
qmf/ConsoleEvent.cpp \
qmf/ConsoleEventImpl.h \
qmf/ConsoleSession.cpp \
diff --git a/qpid/cpp/include/qpid/sys/MemStat.h b/qpid/cpp/src/qpid/sys/MemStat.h
index d855786cd5..d855786cd5 100644
--- a/qpid/cpp/include/qpid/sys/MemStat.h
+++ b/qpid/cpp/src/qpid/sys/MemStat.h