Makefile: link libos.a statically (no .la)

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

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index d1bc41d29a33f2bb478afc19e2a9c61cc26de64d..09c4a24caf56e24bb231b1444fc9524cb38b2956 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -170,8 +170,8 @@ LIBCRUSH = libcrush.la
 LIBCOMPRESSOR = libcompressor.la -lsnappy
 LIBJSON_SPIRIT = libjson_spirit.la
 LIBLOG = liblog.la
-LIBOS = libos.la
-LIBOS_TYPES = libos_types.la
+LIBOS = libos.a
+LIBOS_TYPES = libos_types.a
 LIBOSD = libosd.a
 LIBOSD_TYPES = libosd_types.la
 LIBOSDC = libosdc.la
@@ -234,6 +234,7 @@ LIBOSD += $(LIBOSD_TYPES) $(LIBOS_TYPES)
 
 # Always use system leveldb
 LIBOS += -lleveldb -lsnappy
+LIBOS += $(LIBOS_TYPES)
 
 LIBMON += $(LIBMON_TYPES)
 

diff --git a/src/os/Makefile.am b/src/os/Makefile.am
index fdb6c99ea313ba7d18eca9e2a398d7fecdd1a16f..54012d4a0cae2ed7bc2f53102d4ce8060a3a2db5 100644 (file)
--- a/src/os/Makefile.am
+++ b/src/os/Makefile.am
@@ -1,11 +1,11 @@
-libos_types_la_SOURCES = \
+libos_types_a_SOURCES = \
        os/Transaction.cc
-libos_types_la_CXXFLAGS = ${AM_CXXFLAGS}
-noinst_LTLIBRARIES += libos_types.la
+libos_types_a_CXXFLAGS = ${AM_CXXFLAGS}
+noinst_LIBRARIES += libos_types.a
 
 if ENABLE_SERVER
 
-libos_la_SOURCES = \
+libos_a_SOURCES = \
        os/chain_xattr.cc \
        os/fs/FS.cc \
        os/DBObjectMap.cc \
@@ -26,28 +26,31 @@ libos_la_SOURCES = \
        common/TrackedOp.cc
 
 if LINUX
-libos_la_SOURCES += os/BtrfsFileStoreBackend.cc
+libos_a_SOURCES += os/BtrfsFileStoreBackend.cc
 endif
 
 if WITH_LIBAIO
-libos_types_la_SOURCES += os/newstore/newstore_types.cc
-libos_la_SOURCES += os/newstore/NewStore.cc
+libos_types_a_SOURCES += os/newstore/newstore_types.cc
+libos_a_SOURCES += os/newstore/NewStore.cc
 endif
 
 if WITH_LIBXFS
-libos_la_SOURCES += \
+libos_a_SOURCES += \
     os/fs/XFS.cc \
     os/XfsFileStoreBackend.cc
 endif
 
 if WITH_LIBZFS
-libos_la_SOURCES += os/ZFSFileStoreBackend.cc
+libos_a_SOURCES += os/ZFSFileStoreBackend.cc
 endif
 
-libos_la_CXXFLAGS = ${AM_CXXFLAGS}
-libos_la_LIBADD = $(LIBOS_TYPES)
+libos_a_CXXFLAGS = ${AM_CXXFLAGS}
+libos_a_LIBADD = $(LIBOS_TYPES)
+if WITH_LTTNG
+libos_a_LIBADD += $(LIBOS_TP)
+endif
 
-noinst_LTLIBRARIES += libos.la
+noinst_LIBRARIES += libos.a
 
 noinst_HEADERS += \
        os/btrfs_ioctl.h \
@@ -103,9 +106,9 @@ noinst_HEADERS += os/ZFS.h
 endif
 
 if WITH_KINETIC
-libos_la_SOURCES += os/KineticStore.cc
-libos_la_CXXFLAGS += -std=gnu++11
-libos_la_LIBADD += -lkinetic_client -lprotobuf -lglog -lgflags libcrypto.a
+libos_a_SOURCES += os/KineticStore.cc
+libos_a_CXXFLAGS += -std=gnu++11
+libos_a_LIBADD += -lkinetic_client -lprotobuf -lglog -lgflags libcrypto.a
 noinst_HEADERS += os/KineticStore.h
 endif