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 f39ab4ed5c9bf5cfdc1e569ea6c838aa1d65549a..1059d80711f1bea0c17df87c8311a4a62d18e704 100644 (file)
--- 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 d9f03822f3c887336d3290d7a381a4edb100d098..ea13bcf3a088d692511576c6059e8cf3fd6a4dd9 100644 (file)
--- 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 2e91517d21cac70eda44f10d8a3bb59e934fb22e..68c65037158f954ac6c448a711e23419ab7ce23c 100644 (file)
--- 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 3e91d7dbdb5d849c2afa9d40a75f49b8424f48d3..8a2cb2bda4f39b794d67d26054e7629dfb4bb7f9 100644 (file)
--- 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 += \