From: Noah Watkins Date: Tue, 31 Mar 2015 17:46:10 +0000 (-0700) Subject: make: fix with_rbd guard X-Git-Tag: v9.0.0~59^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4c646ca5b942aeb30fdba79cf661b37771ad7ad;p=ceph.git make: fix with_rbd guard FileJournal needs stuff from blkdev.c in libcommon. ./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::_open_block_device()': /home/nwatkins/src/ceph/src/os/FileJournal.cc:139: undefined reference to `get_block_device_size(int, long*)' /home/nwatkins/src/ceph/src/os/FileJournal.cc:161: undefined reference to `block_device_support_discard(char const*)' ./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::do_discard(long, long)': /home/nwatkins/src/ceph/src/os/FileJournal.cc:1587: undefined reference to `block_device_discard(int, long, long)' Signed-off-by: Noah Watkins --- diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 60d4e2051c0a..2778b58e3aae 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -75,10 +75,8 @@ libcommon_internal_la_SOURCES = \ common/Cycles.cc \ common/ContextCompletion.cc -if WITH_RBD libcommon_internal_la_SOURCES += \ common/blkdev.cc -endif if ENABLE_XIO libcommon_internal_la_SOURCES += \