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 <noahwatkins@gmail.com>

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 60d4e2051c0ad220ad80247c0519e670d3480958..2778b58e3aaee1e77aeb648232d16de42a31299e 100644 (file)
--- 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 += \