Author: aconway
Date: Wed Apr 16 08:45:01 2008
New Revision: 648726
URL: http://svn.apache.org/viewvc?rev=648726&view=rev
Log:
Separate new codec from liqqpidcommon to improve link times.
To be included in libqpidcommon when we are ready to replace framing codec.
Modified:
incubator/qpid/trunk/qpid/cpp/rubygen/generate
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/generate
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/generate?rev=648726&r1=648725&r2=648726&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/generate (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/generate Wed Apr 16 08:45:01 2008
@@ -63,18 +63,25 @@
Dir.chdir dir
rgen_generator=generator_files.map{ |f| "$(rgen_dir)/#{f}" }
rgen_srcs=GenFiles.get.map{ |f| "#{$outdir}/#{f}" }
-
+ rgen_subdirs={}
+ rgen_srcs.each { |src|
+ if src.match(%r{./gen/qpid/([^/]+)/})
+ subdir=$1
+ rgen_subdirs[subdir] ||= []
+ rgen_subdirs[subdir] << src
+ end
+ }
File.open(makefile, 'w') { |out|
out << <<EOS
# Generated makefile fragment.
# Including makefile defines $(rgen_dir) $(rgen_cmd) and $(specs).
rgen_generator=#{make_continue rgen_generator}
-
-rgen_client_cpp=#{make_continue(rgen_srcs.grep(%r|/qpid/client/.+\.cpp$|))}
-
-rgen_common_cpp=#{make_continue(rgen_srcs.grep(%r{qpid/(framing|amqp_.+)/.+\.cpp$}))}
-
+EOS
+ rgen_subdirs.each_key { |subdir|
+ out << "\nrgen_#{subdir}_srcs = #{make_continue(rgen_subdirs[subdir])}\n"
+ }
+ out << <<EOS
rgen_srcs=#{make_continue rgen_srcs}
# Header file install rules.
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=648726&r1=648725&r2=648726&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Wed Apr 16 08:45:01 2008
@@ -79,7 +79,7 @@
platform_src = $(posix_plat_src)
platform_hdr = $(posix_plat_hdr)
-lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
+lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
libqpidamqp_0_10.la
include cluster.mk
@@ -92,17 +92,8 @@
libLogger_la_SOURCES=qpid/log/Logger.cpp qpid/log/Logger.h
libLogger_la_CXXFLAGS=$(AM_CXXFLAGS) -Wno-unused-parameter
-libqpidcommon_la_LIBADD = \
- -lboost_program_options \
- -lboost_filesystem \
- -luuid \
- libLogger.la \
- $(LIB_DLOPEN) \
- $(LIB_CLOCK_GETTIME)
-
-libqpidcommon_la_SOURCES = \
- $(rgen_common_cpp) \
- $(platform_src) \
+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.h \
@@ -128,7 +119,20 @@
qpid/amqp_0_10/UnknownType.h \
qpid/amqp_0_10/UnknownType.cpp \
qpid/amqp_0_10/UnknownStruct.h \
- qpid/amqp_0_10/UnknownStruct.cpp \
+ qpid/amqp_0_10/UnknownStruct.cpp
+
+libqpidcommon_la_LIBADD = \
+ -lboost_program_options \
+ -lboost_filesystem \
+ -luuid \
+ libLogger.la \
+ $(libqpidamqp_0_10_la_SOURCES) \
+ $(LIB_DLOPEN) \
+ $(LIB_CLOCK_GETTIME)
+
+libqpidcommon_la_SOURCES = \
+ $(rgen_framing_srcs) \
+ $(platform_src) \
qpid/Serializer.h \
qpid/framing/AccumulatedAck.cpp \
qpid/framing/AMQBody.cpp \
@@ -254,7 +258,7 @@
libqpidclient_la_LIBADD = libqpidcommon.la
libqpidclient_la_SOURCES = \
- $(rgen_client_cpp) \
+ $(rgen_client_srcs) \
qpid/client/SessionBase.cpp \
qpid/client/Connection.cpp \
qpid/client/Channel.cpp \
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=648726&r1=648725&r2=648726&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Wed Apr 16 08:45:01 2008
@@ -6,6 +6,7 @@
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
#
# Initialize variables that are incremented with +=
@@ -26,8 +27,8 @@
TESTS+=unit_test
check_PROGRAMS+=unit_test
-unit_test_LDADD=-lboost_unit_test_framework -lboost_regex \
- $(lib_client) $(lib_broker)
+unit_test_LDADD=-lboost_unit_test_framework -lboost_regex \
+ $(lib_client) $(lib_broker) $(lib_amqp_0_10)
unit_test_SOURCES= unit_test.cpp unit_test.h \
BrokerFixture.h SocketProxy.h \
exception_test.cpp \
