Makefile: move objclass/*.cc to libosd.la

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index add2b6c9176376d77ba386f7b5fe0e4a188f8e28..cad0a592b8313c8d0a34eb7712c493a34d801a47 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,8 +94,7 @@ bin_PROGRAMS += ceph_mon_store_converter
 
 
 # osd
-ceph_osd_SOURCES = ceph_osd.cc objclass/class_debug.cc \
-              objclass/class_api.cc
+ceph_osd_SOURCES = ceph_osd.cc
 ceph_osd_LDADD = libosd.a $(LIBOS_LDA) $(LIBGLOBAL_LDA)
 ceph_osd_CXXFLAGS = ${AM_CXXFLAGS}
 bin_PROGRAMS += ceph-osd
@@ -117,8 +116,7 @@ ceph_conf_LDADD = $(LIBGLOBAL_LDA)
 ceph_conf_CXXFLAGS = ${AM_CXXFLAGS}
 ceph_authtool_SOURCES = ceph_authtool.cc
 ceph_authtool_LDADD = $(LIBGLOBAL_LDA)
-ceph_filestore_dump_SOURCES = tools/ceph-filestore-dump.cc objclass/class_debug.cc \
-              objclass/class_api.cc
+ceph_filestore_dump_SOURCES = tools/ceph-filestore-dump.cc
 ceph_filestore_dump_SOURCES += perfglue/disabled_heap_profiler.cc
 ceph_filestore_dump_LDADD = libosd.a $(LIBOS_LDA) $(LIBGLOBAL_LDA) -lboost_program_options
 if LINUX
@@ -834,7 +832,7 @@ unittest_osd_types_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 unittest_osd_types_LDADD = $(LIBGLOBAL_LDA) libcommon.la ${UNITTEST_LDADD} 
 check_PROGRAMS += unittest_osd_types
 
-unittest_pglog_SOURCES = test/osd/TestPGLog.cc objclass/class_api.cc perfglue/disabled_heap_profiler.cc
+unittest_pglog_SOURCES = test/osd/TestPGLog.cc perfglue/disabled_heap_profiler.cc
 unittest_pglog_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 unittest_pglog_LDADD =  libosd.a $(LIBOS_LDA) $(LIBGLOBAL_LDA) ${UNITTEST_LDADD} 
 check_PROGRAMS += unittest_pglog
@@ -1708,7 +1706,9 @@ libosd_a_SOURCES = \
        osd/Watch.cc \
        osd/ClassHandler.cc \
        osd/OpRequest.cc \
-       osd/SnapMapper.cc
+       osd/SnapMapper.cc \
+       objclass/class_debug.cc \
+       objclass/class_api.cc
 libosd_a_CXXFLAGS= ${AM_CXXFLAGS}
 noinst_LIBRARIES += libosd.a