diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-06-19 17:11:52 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-06-19 17:11:52 +0000 |
| commit | 7e5ceaf484253d00e17cb8579e802f12c1d06236 (patch) | |
| tree | 37e47003fb0d223f65f21fc3b2a698c255aec34e /qpid/cpp/src/Makefile.am | |
| parent | 706675d432369def04b47ab935a17adec390e202 (diff) | |
| download | qpid-python-7e5ceaf484253d00e17cb8579e802f12c1d06236.tar.gz | |
QPID-4938: No longer build acl or ssl support as plugins
(also remove final references to dead watchdog plugin)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494697 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/Makefile.am')
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 257be80611..a3825f7508 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -144,6 +144,8 @@ BROKER_CXXFLAGS = -D_IN_QPID_BROKER ## Automake macros to build libraries and executables. qpidd_CXXFLAGS = $(AM_CXXFLAGS) $(BROKER_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduleexecdir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" +libqpidcommon_la_CXXFLAGS = $(AM_CXXFLAGS) +libqpidbroker_la_CXXFLAGS = $(AM_CXXFLAGS) $(BROKER_CXXFLAGS) libqpidclient_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_MODULE_DIR=\"$(cmoduleexecdir)\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" qpidd_LDADD = \ @@ -227,7 +229,6 @@ dmoduleexec_LTLIBRARIES = cmoduleexec_LTLIBRARIES = include ha.mk -include acl.mk include qmf.mk include qmfc.mk if HAVE_XML @@ -294,10 +295,6 @@ RdmaClient_LDADD = \ endif -if SSL -include ssl.mk -endif - EXTRA_DIST +=\ CMakeLists.txt \ config.h.cmake \ @@ -579,6 +576,20 @@ libqpidbroker_la_LIBADD = libqpidcommon.la libqpidbroker_la_SOURCES = \ $(mgen_broker_cpp) \ $(posix_broker_src) \ + qpid/acl/Acl.cpp \ + qpid/acl/Acl.h \ + qpid/acl/AclConnectionCounter.cpp \ + qpid/acl/AclConnectionCounter.h \ + qpid/acl/AclData.cpp \ + qpid/acl/AclData.h \ + qpid/acl/AclPlugin.cpp \ + qpid/acl/AclReader.cpp \ + qpid/acl/AclReader.h \ + qpid/acl/AclResourceCounter.cpp \ + qpid/acl/AclResourceCounter.h \ + qpid/acl/AclTopicMatch.h \ + qpid/acl/AclValidator.cpp \ + qpid/acl/AclValidator.h \ qpid/amqp_0_10/Connection.cpp \ qpid/amqp_0_10/Connection.h \ qpid/broker/AclModule.h \ @@ -784,7 +795,6 @@ libqpidbroker_la_SOURCES = \ QPIDBROKER_VERSION_INFO = 2:0:0 libqpidbroker_la_LDFLAGS = -version-info $(QPIDBROKER_VERSION_INFO) -libqpidbroker_la_CXXFLAGS=$(AM_CXXFLAGS) $(BROKER_CXXFLAGS) if HAVE_PROTON @@ -929,6 +939,10 @@ libqpidclient_la_SOURCES = \ QPIDCLIENT_VERSION_INFO = 2:0:0 libqpidclient_la_LDFLAGS = -version-info $(QPIDCLIENT_VERSION_INFO) +if SSL +include ssl.mk +endif + libqpidtypes_la_LIBADD= -luuid libqpidtypes_la_SOURCES= \ qpid/types/Exception.cpp \ |