rados: build librados, libcrush using libtool

Finally?

diff --git a/autogen.sh b/autogen.sh
index b299eb0ff97b4b6bfe5708d81ce28ff14229cb14..465d81bee9d53890fb5029bd86ec6db621b12e1a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 rm -f config.cache
 aclocal #-I m4
+libtoolize --force --copy
 autoconf
 autoheader
 automake -a --add-missing

diff --git a/configure.ac b/configure.ac
index 8ae8946484e62b1623bb45e94ab314192df97aac..ce75af76d5ba9371067583c176c3e1eef5d25497 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@ AC_CANONICAL_TARGET
 # Automake
 AM_INIT_AUTOMAKE(ceph, 0.8)
 AM_PROG_CC_C_O
+AM_PROG_LIBTOOL
 
 # Platform
 case "${target_os}" in
@@ -24,8 +25,9 @@ esac
 # Checks for programs.
 AC_PROG_CXX
 #AC_PROG_CC
-AC_PROG_RANLIB
+#AC_PROG_RANLIB
 AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL
 
 # Checks for libraries.
 AC_CHECK_LIB([m], [pow])

diff --git a/src/Makefile.am b/src/Makefile.am
index 2f6254b3bb10b0060fe0989c703bd9f3b609fda4..5fd699bcd64ad4e3f1191bda7c358bcd57ec6ef7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,45 +89,28 @@ endif
 
 ##########
 BUILT_SOURCES =
+lib_LTLIBRARIES = 
 
 # libcrush.so
-libcrush_so_a_SOURCES = \
+libcrush_la_SOURCES = \
        crush/builder.c \
        crush/mapper.c \
        crush/crush.c
-
-libcrush.so: ${libcrush_so_a_SOURCES}
-       ${CC} -I. -fPIC -shared -Wl,-soname,$@.1 ${AM_CFLAGS} ${LIBS} $^ -o $@
-BUILT_SOURCES += libcrush.so
+libcrush_la_CFLAGS = ${AM_CFLAGS}
+lib_LTLIBRARIES += libcrush.la
 
 # librados
-librados_so_a_SOURCES = \
+librados_la_SOURCES = \
        librados.cc \
        msg/SimpleMessenger.cc \
        osdc/Objecter.cc \
-       mon/MonClient.cc \
-       msg/Message.cc \
-       common/Clock.cc \
-       common/Timer.cc \
-       common/Finisher.cc \
-       common/sctp_crc32.c\
-       common/assert.cc \
-       common/ConfUtils.cc \
-       mon/MonMap.cc \
-       mon/MonClient.cc \
-       osd/OSDMap.cc \
-       common/tls.cc \
-       common/common_init.cc \
-       common/buffer.cc \
-       common/debug.cc \
-       config.cc \
-       common/lockdep.cc
-librados.so: ${librados_so_a_SOURCES}
-       ${CXX} -fPIC -shared -Wl,-soname,$@.1 -I. ${AM_CXXFLAGS} ${LIBS} $^ -o $@
-BUILT_SOURCES += librados.so
+       ${libcommon_a_SOURCES}
+librados_la_CFLAGS = ${AM_CFLAGS}
+librados_la_CXXFLAGS = ${AM_CXXFLAGS}
+lib_LTLIBRARIES += librados.la
 
 testrados_SOURCES = testrados.cc
-
+testrados_LDADD = librados.la libcrush.la
 
 
 
@@ -181,7 +164,7 @@ noinst_LIBRARIES = \
        libmon.a libmds.a libosdc.a libosd.a libclient.a \
        libos.a
 
-noinst_LIBRARIES += libcrush_so.a librados_so.a #libcephclient_so.a
+noinst_LIBRARIES +=  #libcephclient_so.a
 
 # extra bits
 EXTRA_DIST = verify-mds-journal.sh vstart.sh \
@@ -371,6 +354,7 @@ noinst_HEADERS = \
         include/intarith.h\
         include/interval_set.h\
         include/inttypes.h\
+       include/librados.h\
         include/lru.h\
        include/msgr.h\
         include/nstring.h\
@@ -424,7 +408,6 @@ noinst_HEADERS = \
        kernel/super.c\
        kernel/super.h\
        kernel/types.h\
-       include/librados.h\
        mds/locks.c\
        mds/locks.h\
         mds/Anchor.h\

diff --git a/src/testrados.cc b/src/testrados.cc
index 4d904a599a44ceb903d037809a826782a46a5ef2..0f19874892f44b6d1b7c4a84fcf37402585c6867 100644 (file)
--- a/src/testrados.cc
+++ b/src/testrados.cc
@@ -12,7 +12,7 @@
  * 
  */
 
-#include "librados.h"
+#include "include/librados.h"
 
 int main(int argc, const char **argv) 
 {