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/ssl.mk | |
| 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/ssl.mk')
| -rw-r--r-- | qpid/cpp/src/ssl.mk | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/qpid/cpp/src/ssl.mk b/qpid/cpp/src/ssl.mk index aaaf14ed54..9a92c7abc7 100644 --- a/qpid/cpp/src/ssl.mk +++ b/qpid/cpp/src/ssl.mk @@ -19,7 +19,7 @@ # # Makefile fragment, conditionally included in Makefile.am # -libsslcommon_la_SOURCES = \ +libqpidcommon_la_SOURCES += \ qpid/sys/ssl/check.h \ qpid/sys/ssl/check.cpp \ qpid/sys/ssl/util.h \ @@ -27,41 +27,21 @@ libsslcommon_la_SOURCES = \ qpid/sys/ssl/SslSocket.h \ qpid/sys/ssl/SslSocket.cpp -SSLCOMMON_VERSION_INFO = 2:0:0 -libsslcommon_la_LDFLAGS = -version-info $(SSLCOMMON_VERSION_INFO) -libsslcommon_la_LIBADD= -lnss3 -lssl3 -lnspr4 libqpidcommon.la -libsslcommon_la_CXXFLAGS=$(AM_CXXFLAGS) $(SSL_CFLAGS) +libqpidcommon_la_LIBADD += -lnss3 -lssl3 -lnspr4 +libqpidcommon_la_CXXFLAGS += $(SSL_CFLAGS) -lib_LTLIBRARIES += libsslcommon.la - -ssl_la_SOURCES = \ +libqpidbroker_la_SOURCES += \ qpid/sys/SslPlugin.cpp -ssl_la_LIBADD= libqpidbroker.la libsslcommon.la - -ssl_la_CXXFLAGS=$(AM_CXXFLAGS) $(SSL_CFLAGS) -D_IN_QPID_BROKER - -ssl_la_LDFLAGS = $(PLUGINLDFLAGS) +libqpidbroker_la_CXXFLAGS += $(SSL_CFLAGS) -dmoduleexec_LTLIBRARIES += ssl.la - -sslconnector_la_SOURCES = \ +libqpidclient_la_SOURCES += \ qpid/client/SslConnector.cpp +libqpidclient_la_CXXFLAGS += $(SSL_CFLAGS) + if HAVE_PROTON -sslconnector_la_SOURCES += \ +libqpidclient_la_SOURCES += \ qpid/messaging/amqp/SslTransport.cpp \ qpid/messaging/amqp/SslTransport.h endif #HAVE_PROTON - - -sslconnector_la_LIBADD = \ - libqpidclient.la \ - libsslcommon.la - -sslconnector_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" $(SSL_CFLAGS) - -sslconnector_la_LDFLAGS = $(PLUGINLDFLAGS) - -cmoduleexec_LTLIBRARIES += \ - sslconnector.la |