]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tests : Fixed broken Makefiles after integration of lttng into rados.
authorSebastien Ponce <Sebastien.Ponce@cern.ch>
Wed, 27 May 2015 08:26:18 +0000 (10:26 +0200)
committerSebastien Ponce <sebastien.ponce@cern.ch>
Tue, 23 Jun 2015 11:04:22 +0000 (13:04 +0200)
The symbols of lttng were exposed twice leading to error when launching executables using libradosstriper.

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
src/libradosstriper/Makefile.am

index 8ed40c57552aaa69a6223b1b2d0491a858e2fa5b..13b8b28c4935803c4bdf92110cf748fc914da18a 100644 (file)
@@ -10,8 +10,8 @@ libradosstriper_la_SOURCES = \
 # We need this to avoid basename conflicts with the libradosstriper build tests in test/Makefile.am
 libradosstriper_la_CXXFLAGS = ${AM_CXXFLAGS}
 
-LIBRADOSSTRIPER_DEPS = $(LIBRADOS_DEPS) librados_api.la
-libradosstriper_la_LIBADD = $(LIBRADOSSTRIPER_DEPS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
+LIBRADOSSTRIPER_DEPS = librados_internal.la libcls_lock_client.la $(LIBOSDC) $(LIBCOMMON_DEPS)
+libradosstriper_la_LIBADD = $(LIBRADOSSTRIPER_DEPS) $(LIBRADOS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
 libradosstriper_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
 if LINUX
 libradosstriper_la_LDFLAGS += -export-symbols-regex '^radosstriper_.*'