diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2008-10-15 17:05:31 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2008-10-15 17:05:31 +0000 |
| commit | ca2c15b9121db502807221936bc146a4b5520234 (patch) | |
| tree | aa1be37782166521f8a772f18d2047927506aaa5 /cpp/src/Makefile.am | |
| parent | 207dbcb73d225bdd21e797706a6ea2f235790f98 (diff) | |
| download | qpid-python-ca2c15b9121db502807221936bc146a4b5520234.tar.gz | |
QPID-1341 from Jonathan
- Patch applied for Jonathan
- Made the following changes
- added PreRoute for route() for sequencing
- changed xmlexchange form struct to class
- added xml.so to verify script
- removed two unsed files.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@704962 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index cde2847728..37fa6b50d6 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -115,6 +115,7 @@ cmodule_LTLIBRARIES = include cluster.mk include acl.mk include qmf.mk +include xml.mk # The logger library uses boost::date_time to format time. # We have to disable the unused parameters warning to get around @@ -285,9 +286,6 @@ libqpidcommon_la_SOURCES = \ qpid/pointer_to_other.h libqpidbroker_la_LIBADD = libqpidcommon.la -luuid -if HAVE_XML -libqpidbroker_la_LIBADD += -lxerces-c -lxqilla -endif if HAVE_SASL libqpidbroker_la_LIBADD += -lsasl2 endif @@ -360,11 +358,6 @@ libqpidbroker_la_SOURCES = \ qpid/management/ManagementExchange.cpp \ qpid/sys/TCPIOPlugin.cpp -if HAVE_XML -libqpidbroker_la_SOURCES += qpid/broker/XmlExchange.cpp -endif - - libqpidclient_la_LIBADD = libqpidcommon.la -luuid libqpidclient_la_SOURCES = \ @@ -637,10 +630,6 @@ nobase_include_HEADERS = \ qpid/sys/TimeoutHandler.h \ qpid/sys/uuid.h -if HAVE_XML -nobase_include_HEADERS += qpid/broker/XmlExchange.h -endif - # Force build of qpidd during dist phase so help2man will work. dist-hook: $(BUILT_SOURCES) $(MAKE) qpidd |