RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: link mon statically (not .la)

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-10-15 17:41:35 -04:00
parent f86fbdb735
commit e8614f8978
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile-env.am
View File

@ -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)

2
src/Makefile-server.am
View File

@ -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

6
src/mon/Makefile.am
View File

@ -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 \

2
src/test/Makefile-server.am
View File

@ -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