From: Loic Dachary <loic@dachary.org>
Date: Sun, 16 Mar 2014 11:25:39 +0000 (+0100)
Subject: erasure-code: make libcommon include liberasure-code
X-Git-Tag: v0.79~136^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be319983e64610ab6cef7e2ff1d4986aae2525bb;p=ceph.git

erasure-code: make libcommon include liberasure-code

So that it can be used in OSDMap which is part of libcommon.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index f39ab4ed5c9b..1059d80711f1 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -112,9 +112,10 @@ noinst_HEADERS += \
 
 # important; libmsg before libauth!
 LIBCOMMON_DEPS += \
+	$(LIBERASURE_CODE) \
 	$(LIBMSG) $(LIBAUTH) \
 	$(LIBCRUSH) $(LIBJSON_SPIRIT) $(LIBLOG) $(LIBARCH) \
-	$(KEYUTILS_LIB)
+	$(KEYUTILS_LIB) 
 
 if LINUX
 LIBCOMMON_DEPS += -lrt
diff --git a/src/erasure-code/Makefile.am b/src/erasure-code/Makefile.am
index d9f03822f3c8..ea13bcf3a088 100644
--- a/src/erasure-code/Makefile.am
+++ b/src/erasure-code/Makefile.am
@@ -6,9 +6,8 @@ include erasure-code/jerasure/Makefile.am
 
 liberasure_code_la_SOURCES = \
 	erasure-code/ErasureCodePlugin.cc
-liberasure_code_la_LIBADD = $(LIBOSDC) $(LIBOS)
 if LINUX
-liberasure_code_la_LIBADD += -ldl
+liberasure_code_la_LIBADD = -ldl
 endif # LINUX
 noinst_LTLIBRARIES += liberasure_code.la
 
diff --git a/src/mon/Makefile.am b/src/mon/Makefile.am
index 2e91517d21ca..68c65037158f 100644
--- a/src/mon/Makefile.am
+++ b/src/mon/Makefile.am
@@ -14,7 +14,7 @@ libmon_la_SOURCES = \
 	mon/HealthMonitor.cc \
 	mon/DataHealthService.cc \
 	mon/ConfigKeyService.cc
-libmon_la_LIBADD = $(LIBAUTH) $(LIBCOMMON) $(LIBOS) $(LIBERASURE_CODE)
+libmon_la_LIBADD = $(LIBAUTH) $(LIBCOMMON) $(LIBOS)
 noinst_LTLIBRARIES += libmon.la
 
 noinst_HEADERS += \
diff --git a/src/osd/Makefile.am b/src/osd/Makefile.am
index 3e91d7dbdb5d..8a2cb2bda4f3 100644
--- a/src/osd/Makefile.am
+++ b/src/osd/Makefile.am
@@ -19,7 +19,7 @@ libosd_la_SOURCES = \
 	osd/osd_types.cc \
 	osd/ECUtil.cc \
 	objclass/class_api.cc
-libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) $(LIBERASURE_CODE)
+libosd_la_LIBADD = $(LIBOSDC) $(LIBOS)
 noinst_LTLIBRARIES += libosd.la
 
 noinst_HEADERS += \