]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "Makefile.am: link some utils with libcrush"
authorSage Weil <sage.weil@dreamhost.com>
Wed, 18 May 2011 17:15:31 +0000 (10:15 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 18 May 2011 17:15:31 +0000 (10:15 -0700)
This reverts commit c26649861e4c154b1bedf6801342d0a8461a2d0a.

I'm not having any problems linking.  I suspect this was some automake
failure and that a 'make clean' is all that's needed to put everything
straight...

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/Makefile.am

index 06e29d14ea0ff276b9a30a35bc90fa996295bb1e..fbf8a4f9a8d121bb3f5710edb8fe8efba77f5067 100644 (file)
@@ -107,7 +107,7 @@ cephfs_SOURCES = cephfs.cc
 bin_PROGRAMS += cephfs
 
 librados_config_SOURCES = librados-config.cc
-librados_config_LDADD = librados.la libcrush.la $(EXTRALIBS)
+librados_config_LDADD = librados.la $(EXTRALIBS)
 bin_PROGRAMS += librados-config
 
 # synthetic client
@@ -275,7 +275,7 @@ librbd_a_CFLAGS = ${AM_CFLAGS}
 librbd_a_CXXFLAGS = ${AM_CXXFLAGS}
 
 rados_SOURCES = rados.cc rados_sync.cc
-rados_LDADD = librados.la libcrush.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
+rados_LDADD = librados.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 bin_PROGRAMS += rados
 
 testrados_SOURCES = testrados.c