diff options
| author | Sage Weil <sage@redhat.com> | 2015-10-15 23:41:35 +0200 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2015-10-17 21:39:03 +0200 |
| commit | e8614f8978978fbd6e3739fc16da2f08873bebc6 (patch) | |
| tree | 16197c4b206a261dab56794f1668d82299b849bc | |
| parent | Makefile: make libosd.a static (not .la) (diff) | |
| download | ceph-e8614f8978978fbd6e3739fc16da2f08873bebc6.tar.xz ceph-e8614f8978978fbd6e3739fc16da2f08873bebc6.zip | |
Makefile: link mon statically (not .la)
Signed-off-by: Sage Weil <sage@redhat.com>
| -rw-r--r-- | src/Makefile-env.am | 4 | ||||
| -rw-r--r-- | src/Makefile-server.am | 2 | ||||
| -rw-r--r-- | src/mon/Makefile.am | 6 | ||||
| -rw-r--r-- | src/test/Makefile-server.am | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/Makefile-env.am b/src/Makefile-env.am index 5fadfa454d3..d1bc41d29a3 100644 --- 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 1e439f875f9..723f533642e 100644 --- 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 ee6542d42d5..0835e6ce629 100644 --- 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 8bf8cfcb19e..ef86e7a9ffb 100644 --- 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 |