From 2dca7371c91ae8da0988a4ac2244af680a5a3099 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Sun, 26 Jan 2014 18:51:08 +0100 Subject: [PATCH] erasure-code: the plugin is in a convenience library So that it can be used by mon without linking with libosd Reviewed-By: Christophe Courtaut Signed-off-by: Loic Dachary --- src/Makefile-env.am | 1 + src/Makefile.am | 3 --- src/mon/Makefile.am | 2 +- src/osd/Makefile.am | 11 +++++++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Makefile-env.am b/src/Makefile-env.am index f637efff767ee..95ac36e631bae 100644 --- a/src/Makefile-env.am +++ b/src/Makefile-env.am @@ -149,6 +149,7 @@ LIBRADOS = librados.la LIBRGW = librgw.la LIBRBD = librbd.la LIBCEPHFS = libcephfs.la +LIBERASURE_CODE = liberasure_code.la if WITH_LIBAIO LIBOS += -laio diff --git a/src/Makefile.am b/src/Makefile.am index 24f8fa93cf461..a41506a44f104 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,9 +40,6 @@ bin_PROGRAMS += ceph-mon ceph_osd_SOURCES = ceph_osd.cc ceph_osd_LDADD = $(LIBOSD) $(CEPH_GLOBAL) $(LIBCOMMON) -if LINUX -ceph_osd_LDADD += -ldl -endif # LINUX bin_PROGRAMS += ceph-osd ceph_mds_SOURCES = ceph_mds.cc diff --git a/src/mon/Makefile.am b/src/mon/Makefile.am index 68c65037158f9..2e91517d21cac 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) +libmon_la_LIBADD = $(LIBAUTH) $(LIBCOMMON) $(LIBOS) $(LIBERASURE_CODE) noinst_LTLIBRARIES += libmon.la noinst_HEADERS += \ diff --git a/src/osd/Makefile.am b/src/osd/Makefile.am index 9bbc7e4616e0c..b70e2f83458b5 100644 --- a/src/osd/Makefile.am +++ b/src/osd/Makefile.am @@ -4,8 +4,15 @@ erasure_codelib_LTLIBRARIES = include osd/ErasureCodePluginJerasure/Makefile.am +liberasure_code_la_SOURCES = \ + osd/ErasureCodePlugin.cc +liberasure_code_la_LIBADD = $(LIBOSDC) $(LIBOS) +if LINUX +liberasure_code_la_LIBADD += -ldl +endif # LINUX +noinst_LTLIBRARIES += liberasure_code.la + libosd_la_SOURCES = \ - osd/ErasureCodePlugin.cc \ osd/PG.cc \ osd/PGLog.cc \ osd/ReplicatedPG.cc \ @@ -22,7 +29,7 @@ libosd_la_SOURCES = \ osd/SnapMapper.cc \ osd/osd_types.cc \ objclass/class_api.cc -libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) +libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) $(LIBERASURE_CODE) noinst_LTLIBRARIES += libosd.la noinst_HEADERS += \ -- 2.39.5