librados, librbd, librgw: remove dep on libglobal

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 23f447fc7c6b84f2828960aed6e950d68ed8bc3e..b24db2a21397c6c57aa1e34b0fe38aa7847bfcb2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,7 @@ cephfs_SOURCES = cephfs.cc
 bin_PROGRAMS += cephfs
 
 librados_config_SOURCES = librados-config.cc
-librados_config_LDADD = librados.la $(EXTRALIBS)
+librados_config_LDADD = libglobal.la librados.la $(EXTRALIBS)
 bin_PROGRAMS += librados-config
 
 # synthetic client
@@ -152,7 +152,7 @@ psim_LDADD = $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += psim
 
 test_mutate_SOURCES = test/test_mutate.cc
-test_mutate_LDADD = librados.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
+test_mutate_LDADD = libglobal.la librados.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 bin_DEBUGPROGRAMS += test_mutate
 
 testmsgr_SOURCES = testmsgr.cc
@@ -173,7 +173,7 @@ test_trans_LDADD = libos.la $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += test_trans
 
 testsnaps_SOURCES = test/osd/TestSnaps.cc
-testsnaps_LDADD = librados.la $(LIBGLOBAL_LDA)
+testsnaps_LDADD = libglobal.la librados.la $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += testsnaps
 
 test_libcommon_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files)
@@ -225,7 +225,7 @@ librados_SOURCES = \
 librados_la_SOURCES = ${librados_SOURCES}
 librados_la_CFLAGS = ${CRYPTO_CFLAGS} ${AM_CFLAGS}
 librados_la_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
-librados_la_LIBADD = libglobal.la -lpthread $(CRYPTO_LIBS) $(EXTRALIBS)
+librados_la_LIBADD = libcommon.la -lpthread $(CRYPTO_LIBS) $(EXTRALIBS)
 librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 -export-symbols-regex '^rados_.*'
 lib_LTLIBRARIES += librados.la
 
@@ -251,7 +251,7 @@ librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 \
 lib_LTLIBRARIES += librbd.la
 
 rados_SOURCES = rados.cc rados_sync.cc
-rados_LDADD = librados.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
+rados_LDADD = libglobal.la librados.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 bin_PROGRAMS += rados
 
 testrados_SOURCES = testrados.c
@@ -264,7 +264,7 @@ bin_DEBUGPROGRAMS += testrados testradospp radosacl
 
 rbd_SOURCES = rbd.cc common/fiemap.cc common/secret.c
 rbd_CXXFLAGS = ${AM_CXXFLAGS}
-rbd_LDADD = librbd.la librados.la -lpthread -lm -lkeyutils $(CRYPTO_LIBS) $(EXTRALIBS)
+rbd_LDADD = libglobal.la librbd.la librados.la -lpthread -lm -lkeyutils $(CRYPTO_LIBS) $(EXTRALIBS)
 bin_PROGRAMS += rbd
 
 testlibrbd_SOURCES = testlibrbd.c
@@ -300,7 +300,7 @@ my_radosgw_src = \
        rgw/rgw_escape.c
 
 my_radosgw_ldadd = \
-       librgw.la librados.la -lfcgi -lcurl -lexpat \
+       libglobal.la librgw.la librados.la -lfcgi -lcurl -lexpat \
        -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 
 radosgw_SOURCES = $(my_radosgw_src) rgw/rgw_main.cc
@@ -579,14 +579,19 @@ clean-local:
        -rm *.so *.gcno *.gcda
 
 # libs
+libcommon_la_SOURCES = $(libcommon_files)
+libcommon_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
+libcommon_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
+noinst_LTLIBRARIES += libcommon.la
+
 libglobal_la_SOURCES = \
-       $(libcommon_files) \
        global/global_context.cc \
        global/global_init.cc \
        global/pidfile.cc \
        global/signal_handler.cc
 libglobal_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
 libglobal_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
+libglobal_la_LIBADD= libcommon.la
 noinst_LTLIBRARIES += libglobal.la
 
 crush_files = \

diff --git a/src/librados.cc b/src/librados.cc
index 66b8f4659af97c7113c6fd5541393033cf18c64c..8ca0a4d3b720a5e256a90b6de42c9bca4c258039 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -3129,9 +3129,6 @@ librados::ObjectOperation::~ObjectOperation()
   delete o;
 }
 
-
-void global_init_set_globals(CephContext *cct); 
-
 ///////////////////////////// C API //////////////////////////////
 extern "C" int rados_create(rados_t *pcluster, const char * const id)
 {
@@ -3142,7 +3139,6 @@ extern "C" int rados_create(rados_t *pcluster, const char * const id)
   }
 
   CephContext *cct = common_preinit(iparams, CODE_ENVIRONMENT_LIBRARY, 0);
-  global_init_set_globals(cct); // FIXME: bug #845
   cct->_conf->parse_env(); // environment variables override
   cct->_conf->apply_changes();
 

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 6d48b1c7666fe1f5c173cf3435410d2636352f95..0ec6331cfe8aa84bebd08978a9638ee21bea29c2 100644 (file)
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -25,8 +25,6 @@
 #include <sstream>
 #include <string.h>
 
-void global_init_set_globals(CephContext *cct); 
-
 int librgw_create(librgw_t *rgw, const char * const id)
 {
   CephInitParameters iparams(CEPH_ENTITY_TYPE_CLIENT, CEPH_CONF_FILE_DEFAULT);
@@ -35,7 +33,6 @@ int librgw_create(librgw_t *rgw, const char * const id)
     iparams.name.set(CEPH_ENTITY_TYPE_CLIENT, id);
   }
   CephContext *cct = common_preinit(iparams, CODE_ENVIRONMENT_LIBRARY, 0);
-  global_init_set_globals(cct); // FIXME: bug #845
   cct->_conf->log_to_stderr = 1; // quiet by default
   cct->_conf->parse_env(); // environment variables override
   cct->_conf->apply_changes();

diff --git a/src/test/librgw.cc b/src/test/librgw.cc
index 5a360a7b4100b07883d7b8c4304641be15669544..24aa52c709bbd1b5dfe05cb0eab7b7546d85c7a4 100644 (file)
--- a/src/test/librgw.cc
+++ b/src/test/librgw.cc
@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 
+/*
 static const char SAMPLE_XML_1[] = \
 "<AccessControlPolicy xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\n\
   <Owner>\n\
@@ -101,3 +102,4 @@ TEST(LibRGW, RoundTrip) {
 
   librgw_shutdown(rgw);
 }
+*/

diff --git a/src/test/test_libcommon_build.cc b/src/test/test_libcommon_build.cc
index e373d3af6a69f09410903a91baa8a567e3ea2432..8215a05dbdae90e9b54d6f443fa7cc2b10092c7d 100644 (file)
--- a/src/test/test_libcommon_build.cc
+++ b/src/test/test_libcommon_build.cc
@@ -1,9 +1,5 @@
 #include "common/common_init.h"
 
-void global_init_set_globals(CephContext *cct)
-{
-}
-
 /* This program exists to test that we can build libcommon without
  * referencing g_ceph_context
  *