Makefile: link TrackedOp in libglobal

1- It doesn't belong in libos.a
2- Automake doesn't like building it as both .la and .a
3- We shouldn't build it 3x anyway

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

diff --git a/src/global/Makefile.am b/src/global/Makefile.am
index 79a7ffff689cd5f0a92d4e97b0e4908ee8b4cf1b..4738b37b02380c2d73b7f4047f5c197e3b684567 100644 (file)
--- a/src/global/Makefile.am
+++ b/src/global/Makefile.am
@@ -2,7 +2,8 @@ libglobal_la_SOURCES = \
        global/global_context.cc \
        global/global_init.cc \
        global/pidfile.cc \
-       global/signal_handler.cc
+       global/signal_handler.cc \
+       common/TrackedOp.cc
 libglobal_la_LIBADD = $(LIBCOMMON)
 noinst_LTLIBRARIES += libglobal.la
 

diff --git a/src/mds/Makefile.am b/src/mds/Makefile.am
index c7b03076c7b0e2cda75331e9784ded36263b2788..ffefdbb44eff5147857862313a1dfa3ae07761cc 100644 (file)
--- a/src/mds/Makefile.am
+++ b/src/mds/Makefile.am
@@ -29,8 +29,7 @@ LIBMDS_SOURCES = \
        mds/SessionMap.cc \
        mds/MDSContext.cc \
        mds/MDSAuthCaps.cc \
-       mds/MDLog.cc \
-       common/TrackedOp.cc
+       mds/MDLog.cc
 LIBMDS_DEPS = $(LIBOSDC)
 
 if ENABLE_CLIENT

diff --git a/src/os/Makefile.am b/src/os/Makefile.am
index ef052745961465ab35af240c8a6a7147a2fda82b..fe126ec801776d9485431d3a0bee01689ddd7ef0 100644 (file)
--- a/src/os/Makefile.am
+++ b/src/os/Makefile.am
@@ -22,8 +22,7 @@ libos_a_SOURCES = \
        os/KeyValueDB.cc \
        os/KeyValueStore.cc \
        os/ObjectStore.cc \
-       os/WBThrottle.cc \
-       common/TrackedOp.cc
+       os/WBThrottle.cc
 
 if LINUX
 libos_a_SOURCES += os/BtrfsFileStoreBackend.cc

diff --git a/src/osd/Makefile.am b/src/osd/Makefile.am
index cd8ff2d99ef33e110901a3601f04def295a0b527..9fafed548f05252f7ba131992e3404767c2fbb8f 100644 (file)
--- a/src/osd/Makefile.am
+++ b/src/osd/Makefile.am
@@ -22,7 +22,6 @@ libosd_a_SOURCES = \
        osd/Watch.cc \
        osd/ClassHandler.cc \
        osd/OpRequest.cc \
-       common/TrackedOp.cc \
        osd/SnapMapper.cc \
        objclass/class_api.cc