]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "Makefile.am: remove unused libs from linking with librbd tests and rbd"
authorJosh Durgin <josh.durgin@dreamhost.com>
Sat, 19 Feb 2011 00:01:10 +0000 (16:01 -0800)
committerJosh Durgin <josh.durgin@dreamhost.com>
Sat, 19 Feb 2011 00:01:10 +0000 (16:01 -0800)
Same problem as 38f38a99149e88f18072fcbdbee316ac21f6f30f.

This reverts commit e5db46cea0997f3f959b2ae896c980585f079ac0.

src/Makefile.am

index 561b3c09a3a02184affd670fda07546892ad2e35..8b89a8d48d783c46bce045ac1df662758645e6f0 100644 (file)
@@ -259,14 +259,14 @@ endif
 
 rbd_SOURCES = rbd.cc common/fiemap.cc
 rbd_CXXFLAGS = ${AM_CXXFLAGS}
-rbd_LDADD = librbd.la
+rbd_LDADD = librbd.la librados.la libcrush.la -lpthread -lm $(CRYPTOPP_LIBS)
 bin_PROGRAMS += rbd
 
 if WITH_DEBUG
 testlibrbd_SOURCES = testlibrbd.c
-testlibrbd_LDADD = librbd.la
+testlibrbd_LDADD = librbd.la libcrush.la -lpthread -lm $(CRYPTOPP_LIBS)
 testlibrbdpp_SOURCES = testlibrbdpp.cc
-testlibrbdpp_LDADD = librbd.la
+testlibrbdpp_LDADD = librbd.la libcrush.la -lpthread -lm $(CRYPTOPP_LIBS)
 bin_PROGRAMS += testlibrbd testlibrbdpp
 endif