From: Sage Weil <sage@redhat.com>
Date: Mon, 19 Oct 2015 14:41:14 +0000 (-0400)
Subject: Makefile: link TrackedOp in libglobal
X-Git-Tag: v10.0.1~116^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1646e0e8dcbf96e88327f0951f00646119f9c60;p=ceph.git

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 79a7ffff689c..4738b37b0238 100644
--- 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 c7b03076c7b0..ffefdbb44eff 100644
--- 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 ef0527459614..fe126ec80177 100644
--- 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 cd8ff2d99ef3..9fafed548f05 100644
--- 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