diff options
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 98e38cf89a..70c43188d7 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -14,37 +14,23 @@ force: # AMQP_XML is defined in ../configure.ac specs=@AMQP_XML@ $(top_srcdir)/xml/cluster.xml -EXTRA_DIST += generate.mk generate.sh $(generated_cpp) $(generated_h) $(rgen_srcs) +EXTRA_DIST += $(rgen_h) -if GENERATE - -# Java code generator. -# Must generate into a separate gen directory because otherwise -# there's no way to figure out which files are generated. - -gentools_dir=$(top_srcdir)/gentools -$(srcdir)/generate.mk $(generated_cpp) $(generated_h): generate.timestamp -generate.timestamp: generate.sh $(specs) $(generator) - env gentools_dir=$(gentools_dir) specs="$(specs)" $(srcdir)/generate.sh - touch $@ - -# Empty rule in case a generator file is renamed/removed. -$(generator): +if GENERATE maintainer-clean-local: rm -rf gen # Ruby generator. rgen_dir=$(top_srcdir)/rubygen -rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate . $(specs) all $(srcdir)/rubygen.mk +rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate $(srcdir)/gen $(specs) all $(srcdir)/rubygen.mk endif # GENERATE -include $(srcdir)/generate.mk include $(srcdir)/rubygen.mk -DISTCLEANFILES=generate.mk rubygen.mk +DISTCLEANFILES=rubygen.mk # Code generated by C++ noinst_PROGRAMS=generate_MethodHolderMaxSize_h @@ -110,6 +96,7 @@ libqpidcommon_la_LIBADD = \ $(LIB_CLOCK_GETTIME) libqpidcommon_la_SOURCES = \ + $(rgen_common_cpp) \ $(platform_src) \ qpid/framing/AMQBody.cpp \ qpid/framing/AMQMethodBody.cpp \ @@ -137,13 +124,10 @@ libqpidcommon_la_SOURCES = \ qpid/framing/FrameHandler.h \ qpid/framing/HandlerUpdater.h \ qpid/framing/Blob.h \ - qpid/framing/AMQP_ClientProxy.cpp \ - qpid/framing/AMQP_ServerProxy.cpp \ qpid/framing/variant.h \ - gen/qpid/framing/AMQP_HighestVersion.h \ + qpid/framing/AMQP_HighestVersion.h \ qpid/framing/Blob.cpp \ qpid/framing/MethodHolder.h qpid/framing/MethodHolder.cpp \ - qpid/framing/MethodHolder_construct.cpp \ qpid/framing/MethodHolderMaxSize.h \ qpid/Exception.cpp \ qpid/Plugin.h \ @@ -217,6 +201,7 @@ libqpidbroker_la_SOURCES = \ libqpidclient_la_LIBADD = libqpidcommon.la libqpidclient_la_SOURCES = \ + $(rgen_client_cpp) \ qpid/client/ClientConnection.cpp \ qpid/client/ClientChannel.cpp \ qpid/client/ClientExchange.cpp \ @@ -233,12 +218,12 @@ libqpidclient_la_SOURCES = \ qpid/client/FutureResponse.cpp \ qpid/client/FutureFactory.cpp \ qpid/client/ReceivedContent.cpp \ - qpid/client/Session.cpp \ qpid/client/SessionCore.cpp \ qpid/client/StateManager.cpp nobase_include_HEADERS = \ + $(rgen_h) \ $(platform_hdr) \ qpid/broker/AccumulatedAck.h \ qpid/broker/BrokerChannel.h \ @@ -329,7 +314,6 @@ nobase_include_HEADERS = \ qpid/client/FutureFactory.h \ qpid/client/ReceivedContent.h \ qpid/client/Response.h \ - qpid/client/Session.h \ qpid/client/SessionCore.h \ qpid/client/StateManager.h \ qpid/framing/AMQBody.h \ @@ -357,6 +341,7 @@ nobase_include_HEADERS = \ qpid/framing/SerializeHandler.h \ qpid/framing/SequenceNumber.h \ qpid/framing/SequenceNumberSet.h \ + qpid/framing/StructHelper.h \ qpid/framing/Value.h \ qpid/framing/Visitor.h \ qpid/framing/Uuid.h \ |