Makefile: make libosd.a static (not .la)

We don't dynamically link the osd.

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

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 63ea49f0142f513907ea3bea87fa562805d9f2aa..5fadfa454d33497741cfbf55ce52b84113eee2c2 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -172,7 +172,7 @@ LIBJSON_SPIRIT = libjson_spirit.la
 LIBLOG = liblog.la
 LIBOS = libos.la
 LIBOS_TYPES = libos_types.la
-LIBOSD = libosd.la
+LIBOSD = libosd.a
 LIBOSD_TYPES = libosd_types.la
 LIBOSDC = libosdc.la
 LIBMON = libmon.la
@@ -229,6 +229,9 @@ LIBMON += $(LIBPERFGLUE)
 LIBOSD += $(LIBPERFGLUE)
 LIBMDS += $(LIBPERFGLUE)
 
+# OSD needs types
+LIBOSD += $(LIBOSD_TYPES) $(LIBOS_TYPES)
+
 # Always use system leveldb
 LIBOS += -lleveldb -lsnappy
 

diff --git a/src/Makefile-server.am b/src/Makefile-server.am
index 689b5c445f67ea037c4bbb9488ff20934fe02ceb..1e439f875f93f27c8915a2f52554285f554ff2d8 100644 (file)
--- a/src/Makefile-server.am
+++ b/src/Makefile-server.am
@@ -43,7 +43,12 @@ bin_SCRIPTS += \
        ceph-clsinfo
 
 ceph_osd_SOURCES = ceph_osd.cc
-ceph_osd_LDADD = $(LIBOSD) $(CEPH_GLOBAL) $(LIBCOMMON)
+ceph_osd_LDADD = \
+       $(LIBOSDC) $(LIBOS) $(LIBOSD) $(LIBOSD_TYPES) $(LIBOS_TYPES) \
+       $(CEPH_GLOBAL) $(LIBCOMMON)
+if WITH_LTTNG
+ceph_osd_LDADD += $(LIBOSD_TP)
+endif
 bin_PROGRAMS += ceph-osd
 
 endif # WITH_OSD

diff --git a/src/osd/Makefile.am b/src/osd/Makefile.am
index da805a252ed66b2e1f51f2192475780340e5de0a..cd8ff2d99ef33e110901a3601f04def295a0b527 100644 (file)
--- a/src/osd/Makefile.am
+++ b/src/osd/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES += libosd_types.la
 if ENABLE_SERVER
 if WITH_OSD
 
-libosd_la_SOURCES = \
+libosd_a_SOURCES = \
        osd/PG.cc \
        osd/ReplicatedPG.cc \
        osd/ReplicatedBackend.cc \
@@ -26,12 +26,9 @@ libosd_la_SOURCES = \
        osd/SnapMapper.cc \
        objclass/class_api.cc
 
-libosd_la_CXXFLAGS = ${AM_CXXFLAGS}
-if WITH_KINETIC
-libosd_la_CXXFLAGS += -std=gnu++11
-endif
-libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) $(LIBOSD_TYPES) $(LIBOS_TYPES)
-noinst_LTLIBRARIES += libosd.la
+libosd_a_CXXFLAGS = ${AM_CXXFLAGS}
+libosd_a_LIBADD =
+noinst_LIBRARIES += libosd.a
 
 noinst_HEADERS += \
        osd/ClassHandler.h \