summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Makefile.am15
-rw-r--r--cpp/src/broker/Makefile.am97
-rw-r--r--cpp/src/client/Makefile.am34
-rw-r--r--cpp/src/gen/Makefile.am37
-rwxr-xr-xcpp/src/make-gen-src-mk.sh (renamed from cpp/src/gen/make-gen-src-mk.sh)6
5 files changed, 10 insertions, 179 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index d8c294c48d..7c3e087431 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -1,7 +1,6 @@
include gen/gen-src.mk
-# This is gmake specific
-genBUILT_SOURCES = $(addprefix $(gen)/, $(generated_sources) $(generated_headers))
+BUILT_SOURCES = $(generated_sources) $(generated_headers)
SUBDIRS = . tests
@@ -272,12 +271,12 @@ nobase_pkginclude_HEADERS = \
sys/ProducerConsumer.h
# This is gmake specific
-nobase_pkginclude_HEADERS += $(addprefix $(gen)/, $(generated_headers))
+nobase_pkginclude_HEADERS += $(generated_headers)
# Distribute the generated sources, at least for now, since
# the generator code is in java.
-EXTRA_DIST += $(genBUILT_SOURCES)
-DISTCLEANFILES = $(genBUILT_SOURCES) $(gen)/timestamp $(gen)/gen-src.mk
+EXTRA_DIST += $(BUILT_SOURCES)
+DISTCLEANFILES = $(BUILT_SOURCES) $(gen)/timestamp $(gen)/gen-src.mk
# Don't attempt to run the code generator unless configure has set
# CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed
@@ -296,15 +295,15 @@ spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml
gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
$(BUILT_SOURCES) $(gen)/timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am
- rm -f $(genBUILT_SOURCES)
+ rm -f $(BUILT_SOURCES)
cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
$(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
-c -o $(gen) -t $(gentools_dir)/templ.cpp $(spec)
touch $(gen)/timestamp
$(gen)/gen-src.mk: $(gen)/timestamp
- cd $(gen)
- $(gen)/make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
+ mkdir -p $(gen)
+ ./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
mv $@-t $@
endif
diff --git a/cpp/src/broker/Makefile.am b/cpp/src/broker/Makefile.am
deleted file mode 100644
index 22f66dc3d9..0000000000
--- a/cpp/src/broker/Makefile.am
+++ /dev/null
@@ -1,97 +0,0 @@
-AM_CXXFLAGS = $(WARNING_CFLAGS)
-INCLUDES = \
- -I$(srcdir)/../gen \
- $(APR_CXXFLAGS)
-
-lib_LTLIBRARIES = libqpidbroker.la
-libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
-libqpidbroker_la_SOURCES = \
- AccumulatedAck.cpp \
- AccumulatedAck.h \
- AutoDelete.cpp \
- AutoDelete.h \
- Binding.h \
- Broker.cpp \
- Broker.h \
- BrokerSingleton.cpp \
- BrokerSingleton.h \
- BrokerChannel.cpp \
- BrokerChannel.h \
- BrokerExchange.h \
- BrokerMessage.cpp \
- BrokerMessage.h \
- BrokerMessageMessage.cpp \
- BrokerMessageMessage.h \
- BrokerQueue.cpp \
- BrokerQueue.h \
- Configuration.cpp \
- Configuration.h \
- ConnectionToken.h \
- Consumer.h \
- Content.h \
- DeletingTxOp.cpp \
- DeletingTxOp.h \
- Deliverable.h \
- DeliverableMessage.cpp \
- DeliverableMessage.h \
- DeliveryRecord.cpp \
- DeliveryRecord.h \
- DirectExchange.cpp \
- DirectExchange.h \
- ExchangeRegistry.cpp \
- ExchangeRegistry.h \
- FanOutExchange.cpp \
- FanOutExchange.h \
- HeadersExchange.cpp \
- HeadersExchange.h \
- InMemoryContent.cpp \
- InMemoryContent.h \
- LazyLoadedContent.cpp \
- LazyLoadedContent.h \
- MessageBuilder.cpp \
- MessageBuilder.h \
- MessageStore.h \
- MessageStoreModule.cpp \
- MessageStoreModule.h \
- NameGenerator.cpp \
- NameGenerator.h \
- NullMessageStore.cpp \
- NullMessageStore.h \
- Persistable.h \
- PersistableExchange.h \
- PersistableMessage.h \
- PersistableQueue.h \
- Prefetch.h \
- QueuePolicy.cpp \
- QueuePolicy.h \
- QueueRegistry.cpp \
- QueueRegistry.h \
- RecoverableMessage.h \
- RecoverableQueue.h \
- RecoveryManager.h \
- RecoveryManagerImpl.cpp \
- RecoveryManagerImpl.h \
- Reference.cpp \
- Reference.h \
- ConnectionFactory.cpp \
- ConnectionFactory.h \
- Connection.cpp \
- Connection.h \
- BrokerAdapter.cpp \
- BrokerAdapter.h \
- MessageHandlerImpl.cpp \
- MessageHandlerImpl.h \
- TopicExchange.cpp \
- TopicExchange.h \
- TransactionalStore.h \
- TxAck.cpp \
- TxAck.h \
- TxBuffer.cpp \
- TxBuffer.h \
- TxOp.h \
- TxPublish.cpp \
- TxPublish.h
-
-
-# Force build during dist phase so help2man will work.
-dist-hook: $(lib_LTLIBRARIES)
diff --git a/cpp/src/client/Makefile.am b/cpp/src/client/Makefile.am
deleted file mode 100644
index 4a98c3f539..0000000000
--- a/cpp/src/client/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-AM_CXXFLAGS = $(WARNING_CFLAGS)
-INCLUDES = \
- -I$(srcdir)/../gen \
- $(APR_CXXFLAGS)
-
-lib_LTLIBRARIES = libqpidclient.la
-libqpidclient_la_LIBADD = ../libqpidcommon.la
-libqpidclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
-libqpidclient_la_SOURCES = \
- ClientChannel.cpp \
- ClientExchange.cpp \
- ClientQueue.cpp \
- BasicMessageChannel.cpp \
- Connection.cpp \
- Connector.cpp \
- IncomingMessage.cpp \
- MessageListener.cpp \
- ResponseHandler.cpp \
- ReturnedMessageHandler.cpp
-pkginclude_HEADERS = \
- AckMode.h \
- ClientChannel.h \
- ClientExchange.h \
- ClientMessage.h \
- ClientQueue.h \
- Connection.h \
- Connector.h \
- IncomingMessage.h \
- MessageChannel.h \
- BasicMessageChannel.h \
- MessageListener.h \
- MethodBodyInstances.h \
- ResponseHandler.h \
- ReturnedMessageHandler.h
diff --git a/cpp/src/gen/Makefile.am b/cpp/src/gen/Makefile.am
deleted file mode 100644
index 470000092c..0000000000
--- a/cpp/src/gen/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-include gen-src.mk
-
-BUILT_SOURCES = $(generated_sources) $(generated_headers)
-pkginclude_HEADERS=$(generated_headers)
-
-# Distribute the generated sources, at least for now, since
-# the generator code is in java.
-EXTRA_DIST = $(BUILT_SOURCES)
-DISTCLEANFILES = $(BUILT_SOURCES) timestamp gen-src.mk
-
-# Don't attempt to run the code generator unless configure has set
-# CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed
-# to run the code generator are available.
-#
-if CAN_GENERATE_CODE
-
-gentools_dir = $(srcdir)/../../gentools
-spec_dir = $(srcdir)/../../../specs
-
-# FIXME aconway 2007-01-04: Enabling Basic class until
-# new messaging class is ready to replace it.
-# spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml $(spec_dir)/amqp-nogen.0-9.xml
-spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml
-
-gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
-
-$(BUILT_SOURCES) timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am
- rm -f $(generated_sources)
- cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
- $(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
- -c -o . -t $(gentools_dir)/templ.cpp $(spec)
- touch timestamp
-
-gen-src.mk: timestamp
- ./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
- mv $@-t $@
-endif
diff --git a/cpp/src/gen/make-gen-src-mk.sh b/cpp/src/make-gen-src-mk.sh
index 08eb8ea134..0a6dd3e326 100755
--- a/cpp/src/gen/make-gen-src-mk.sh
+++ b/cpp/src/make-gen-src-mk.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Generate the gen-src.mk makefile fragment, to stdout.
+# Generates the gen-src.mk makefile fragment, to stdout.
# Usage: <gentools_dir> <gentools_srcdir>
gentools_dir=$1
@@ -8,9 +8,9 @@ gentools_srcdir=$2
wildcard() { echo `ls $* 2>/dev/null` ; }
cat <<EOF
-generated_sources = `wildcard *.cpp`
+generated_sources = `wildcard gen/*.cpp`
-generated_headers = `wildcard *.h`
+generated_headers = `wildcard gen/*.h`
if CAN_GENERATE_CODE
View Lorry Controller Status