Disable compilation of amqp_0_10 codec until ready for integration.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@650227 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 42 insertions, 40 deletions

diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 2af40c3d86..8f075ca51e 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -88,44 +88,44 @@ include cluster.mk
 # unused parameters in boost::date_time headers. So we build it
 # in a convenience library to link into libqpid_common.
 # 
-noinst_LTLIBRARIES=libLogger.la libqpidamqp_0_10.la
+noinst_LTLIBRARIES=libLogger.la # libqpidamqp_0_10.la
 libLogger_la_SOURCES=qpid/log/Logger.cpp qpid/log/Logger.h
 libLogger_la_CXXFLAGS=$(AM_CXXFLAGS) -Wno-unused-parameter
 
 # New 0-10 codec, to be integrated in future.
 # Currently built for tests only.
-libqpidamqp_0_10_la_SOURCES= \
-  $(rgen_amqp_0_10_srcs) \
-  qpid/amqp_0_10/apply.h \
-  qpid/amqp_0_10/built_in_types.h \
-  qpid/amqp_0_10/complex_types.cpp \
-  qpid/amqp_0_10/Array.h \
-  qpid/amqp_0_10/Array.cpp \
-  qpid/amqp_0_10/Body.h \
-  qpid/amqp_0_10/Command.h \
-  qpid/amqp_0_10/CommmandPacker.h \
-  qpid/amqp_0_10/Control.h \
-  qpid/amqp_0_10/Header.h \
-  qpid/amqp_0_10/Header.cpp \
-  qpid/amqp_0_10/FrameHeader.h \
-  qpid/amqp_0_10/FrameHeader.cpp \
-  qpid/amqp_0_10/Holder.h \
-  qpid/amqp_0_10/Codec.h \
-  qpid/amqp_0_10/Packer.h \
-  qpid/amqp_0_10/Decimal.h \
-  qpid/amqp_0_10/SerializableString.h \
-  qpid/amqp_0_10/Map.h \
-  qpid/amqp_0_10/Map.cpp \
-  qpid/amqp_0_10/Struct.h \
-  qpid/amqp_0_10/Struct32.h \
-  qpid/amqp_0_10/Struct32.cpp \
-  qpid/amqp_0_10/Unit.h \
-  qpid/amqp_0_10/Unit.cpp \
-  qpid/amqp_0_10/UnitHandler.h \
-  qpid/amqp_0_10/UnknownType.h \
-  qpid/amqp_0_10/UnknownType.cpp \
-  qpid/amqp_0_10/UnknownStruct.h \
-  qpid/amqp_0_10/UnknownStruct.cpp 
+# libqpidamqp_0_10_la_SOURCES= \
+#   $(rgen_amqp_0_10_srcs) \
+#   qpid/amqp_0_10/apply.h \
+#   qpid/amqp_0_10/built_in_types.h \
+#   qpid/amqp_0_10/complex_types.cpp \
+#   qpid/amqp_0_10/Array.h \
+#   qpid/amqp_0_10/Array.cpp \
+#   qpid/amqp_0_10/Body.h \
+#   qpid/amqp_0_10/Command.h \
+#   qpid/amqp_0_10/CommmandPacker.h \
+#   qpid/amqp_0_10/Control.h \
+#   qpid/amqp_0_10/Header.h \
+#   qpid/amqp_0_10/Header.cpp \
+#   qpid/amqp_0_10/FrameHeader.h \
+#   qpid/amqp_0_10/FrameHeader.cpp \
+#   qpid/amqp_0_10/Holder.h \
+#   qpid/amqp_0_10/Codec.h \
+#   qpid/amqp_0_10/Packer.h \
+#   qpid/amqp_0_10/Decimal.h \
+#   qpid/amqp_0_10/SerializableString.h \
+#   qpid/amqp_0_10/Map.h \
+#   qpid/amqp_0_10/Map.cpp \
+#   qpid/amqp_0_10/Struct.h \
+#   qpid/amqp_0_10/Struct32.h \
+#   qpid/amqp_0_10/Struct32.cpp \
+#   qpid/amqp_0_10/Unit.h \
+#   qpid/amqp_0_10/Unit.cpp \
+#   qpid/amqp_0_10/UnitHandler.h \
+#   qpid/amqp_0_10/UnknownType.h \
+#   qpid/amqp_0_10/UnknownType.cpp \
+#   qpid/amqp_0_10/UnknownStruct.h \
+#   qpid/amqp_0_10/UnknownStruct.cpp 
 
 libqpidcommon_la_LIBADD = \
   -lboost_program_options \
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index a6750a427a..bd020e4f77 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -6,7 +6,7 @@ extra_libs = $(CPPUNIT_LIBS)
 lib_client = $(abs_builddir)/../libqpidclient.la
 lib_common = $(abs_builddir)/../libqpidcommon.la
 lib_broker = $(abs_builddir)/../libqpidbroker.la
-lib_amqp_0_10 = $(abs_builddir)/../libqpidamqp_0_10.la
+# lib_amqp_0_10 = $(abs_builddir)/../libqpidamqp_0_10.la
 
 #
 # Initialize variables that are incremented with +=
@@ -28,7 +28,7 @@ CLEANFILES=
 TESTS+=unit_test
 check_PROGRAMS+=unit_test
 unit_test_LDADD=-lboost_unit_test_framework -lboost_regex  \
-	$(lib_client) $(lib_broker) $(lib_amqp_0_10)
+	$(lib_client) $(lib_broker) # $(lib_amqp_0_10)
 unit_test_SOURCES= unit_test.cpp unit_test.h \
 	BrokerFixture.h SocketProxy.h \
 	exception_test.cpp \
@@ -41,14 +41,16 @@ unit_test_SOURCES= unit_test.cpp unit_test.h \
 	ISList.cpp IList.cpp \
 	ClientSessionTest.cpp \
 	SequenceSet.cpp \
-	amqp_0_10/serialize.cpp allSegmentTypes.h \
-	amqp_0_10/ProxyTemplate.cpp \
-	amqp_0_10/apply.cpp \
 	IncompleteMessageList.cpp \
-	amqp_0_10/Map.cpp \
-	amqp_0_10/handlers.cpp \
 	RangeSet.cpp
 
+# Disabled till we move to amqp_0_10 codec.
+# 	amqp_0_10/serialize.cpp allSegmentTypes.h \
+# 	amqp_0_10/ProxyTemplate.cpp \
+# 	amqp_0_10/apply.cpp \
+# 	amqp_0_10/Map.cpp \
+# 	amqp_0_10/handlers.cpp 
+
 
 check_LTLIBRARIES += libshlibtest.la
 libshlibtest_la_LDFLAGS = -module -rpath $(abs_builddir)