summaryrefslogtreecommitdiff
path: root/cpp/src/Makefile.am
diff options
context:
space:
mode:
authorMichael Goulish <mgoulish@apache.org>2010-05-25 10:08:41 +0000
committerMichael Goulish <mgoulish@apache.org>2010-05-25 10:08:41 +0000
commitaa9438ec35516584a0e5976321e1660f95694f84 (patch)
tree376e7369af81716428cbb23ccc1a07d86ffed3a7 /cpp/src/Makefile.am
parent91dc428b059e59aeb73ebb59fea9b415465b258d (diff)
downloadqpid-python-aa9438ec35516584a0e5976321e1660f95694f84.tar.gz
Removed sasl test db creation from the Makefile logic, and simply put it into the test scripts where it is used. When mixed in with Makefiles, it was breaking make targets like "install".
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@947994 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
-rw-r--r--cpp/src/Makefile.am2
1 files changed, 0 insertions, 2 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index f3f8ac5f1c..15a0eb448a 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -489,8 +489,6 @@ if HAVE_SASL
libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h
libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.cpp
libqpidcommon_la_LIBADD += -lsasl2
-
-include sasl.mk
endif
libqpidbroker_la_LIBADD = libqpidcommon.la -luuid