Makefile: link mon statically (not .la)

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 5fadfa454d33497741cfbf55ce52b84113eee2c2..d1bc41d29a33f2bb478afc19e2a9c61cc26de64d 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -175,7 +175,7 @@ LIBOS_TYPES = libos_types.la
 LIBOSD = libosd.a
 LIBOSD_TYPES = libosd_types.la
 LIBOSDC = libosdc.la
-LIBMON = libmon.la
+LIBMON = libmon.a
 LIBMON_TYPES = libmon_types.la
 LIBMDS = libmds.la
 LIBCLIENT = libclient.la
@@ -235,6 +235,8 @@ LIBOSD += $(LIBOSD_TYPES) $(LIBOS_TYPES)
 # Always use system leveldb
 LIBOS += -lleveldb -lsnappy
 
+LIBMON += $(LIBMON_TYPES)
+
 # Use this for binaries requiring libglobal
 CEPH_GLOBAL = $(LIBGLOBAL) $(LIBCOMMON) $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 

diff --git a/src/Makefile-server.am b/src/Makefile-server.am
index 1e439f875f93f27c8915a2f52554285f554ff2d8..723f533642e9629a74e8be21bcff7c406191058d 100644 (file)
--- a/src/Makefile-server.am
+++ b/src/Makefile-server.am
@@ -27,7 +27,7 @@ su_sbin_SCRIPTS += mount.fuse.ceph
 if WITH_MON
 
 ceph_mon_SOURCES = ceph_mon.cc
-ceph_mon_LDADD = $(LIBMON) $(LIBOS) $(CEPH_GLOBAL) $(LIBCOMMON)
+ceph_mon_LDADD = $(LIBMON) $(LIBOS) $(CEPH_GLOBAL) $(LIBCOMMON) $(LIBAUTH) $(LIBCOMMON) $(LIBMON_TYPES)
 bin_PROGRAMS += ceph-mon
 
 endif # WITH_MON

diff --git a/src/mon/Makefile.am b/src/mon/Makefile.am
index ee6542d42d51ef0171de01544d488ad577778563..0835e6ce6295378bebc8c1770ba2ba70b8201fac 100644 (file)
--- a/src/mon/Makefile.am
+++ b/src/mon/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES += libmon_types.la
 if ENABLE_SERVER
 if WITH_MON
 
-libmon_la_SOURCES = \
+libmon_a_SOURCES = \
        mon/Monitor.cc \
        mon/Paxos.cc \
        mon/PaxosService.cc \
@@ -19,8 +19,8 @@ libmon_la_SOURCES = \
        mon/HealthMonitor.cc \
        mon/DataHealthService.cc \
        mon/ConfigKeyService.cc
-libmon_la_LIBADD = $(LIBAUTH) $(LIBCOMMON) $(LIBOS) $(LIBMON_TYPES)
-noinst_LTLIBRARIES += libmon.la
+libmon_a_LIBADD =
+noinst_LIBRARIES += libmon.a
 
 noinst_HEADERS += \
        mon/AuthMonitor.h \

diff --git a/src/test/Makefile-server.am b/src/test/Makefile-server.am
index 8bf8cfcb19e709b0848853626dac5d1509993726..ef86e7a9ffb6a766f2d124c26cb707c4247308ae 100644 (file)
--- a/src/test/Makefile-server.am
+++ b/src/test/Makefile-server.am
@@ -152,7 +152,7 @@ ceph_test_keys_LDADD = $(LIBMON) $(CEPH_GLOBAL)
 bin_DEBUGPROGRAMS += ceph_test_keys
 
 get_command_descriptions_SOURCES = test/common/get_command_descriptions.cc
-get_command_descriptions_LDADD = $(LIBMON) $(LIBCOMMON) $(CEPH_GLOBAL)
+get_command_descriptions_LDADD = $(LIBMON) $(LIBMON_TYPES) $(LIBOS) $(LIBCOMMON) $(CEPH_GLOBAL)
 noinst_PROGRAMS += get_command_descriptions
 
 unittest_mon_moncap_SOURCES = test/mon/moncap.cc