summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Makefile.am2
-rw-r--r--cpp/src/cluster.mk9
2 files changed, 7 insertions, 4 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 0468a2122b..5b09172ee2 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -105,9 +105,7 @@ endif
lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
-if CLUSTER
include cluster.mk
-endif
# The logger library uses boost::date_time to format time.
# We have to disable the unused parameters warning to get around
diff --git a/cpp/src/cluster.mk b/cpp/src/cluster.mk
index 3658ee91b5..d5b0bed97f 100644
--- a/cpp/src/cluster.mk
+++ b/cpp/src/cluster.mk
@@ -1,11 +1,16 @@
#-*-Makefile-*-
# Cluster library makefile fragment, to be included in Makefile.am
#
-
lib_LTLIBRARIES += libqpidcluster.la
+if CLUSTER
+
libqpidcluster_la_SOURCES = \
qpid/cluster/Cpg.cpp \
qpid/cluster/Cpg.h
-
libqpidcluster_la_LIBADD= -lcpg
+
+else
+# Empty stub library to satisfy rpm spec file.
+libqpidcluster_la_SOURCES =
+endif