From b96f1642b497f76dc7c50f6bd9b2108952caeab9 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 18 Feb 2011 16:01:10 -0800 Subject: [PATCH] Revert "Makefile.am: remove unused libs from linking with librbd tests and rbd" Same problem as 38f38a99149e88f18072fcbdbee316ac21f6f30f. This reverts commit e5db46cea0997f3f959b2ae896c980585f079ac0. --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 561b3c09a3a0..8b89a8d48d78 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 -- 2.47.3