From: Loic Dachary Date: Mon, 9 Sep 2013 22:30:57 +0000 (+0200) Subject: autoconf: use $(LIBOSD) $(LIBCOMMON) instead of libosd.a libcommon.la X-Git-Tag: v0.71~144^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F581%2Fhead;p=ceph.git autoconf: use $(LIBOSD) $(LIBCOMMON) instead of libosd.a libcommon.la hardcoded library names in unit test dependencies break compilation Signed-off-by: Loic Dachary --- diff --git a/src/test/Makefile.am b/src/test/Makefile.am index e793157c128..72246ac748f 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -322,7 +322,7 @@ erasure_codelib_LTLIBRARIES += libec_example.la unittest_erasure_code_plugin_SOURCES = test/osd/TestErasureCodePluginExample.cc unittest_erasure_code_plugin_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_erasure_code_plugin_LDADD = libosd.a libcommon.la $(UNITTEST_LDADD) $(CEPH_GLOBAL) +unittest_erasure_code_plugin_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) if LINUX unittest_erasure_code_plugin_LDADD += -ldl endif @@ -332,7 +332,7 @@ check_PROGRAMS += unittest_erasure_code_plugin unittest_erasure_code_example_SOURCES = test/osd/TestErasureCodeExample.cc noinst_HEADERS += test/osd/ErasureCodeExample.h unittest_erasure_code_example_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_erasure_code_example_LDADD = libosd.a libcommon.la $(UNITTEST_LDADD) $(CEPH_GLOBAL) +unittest_erasure_code_example_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) check_PROGRAMS += unittest_erasure_code_example unittest_osd_types_SOURCES = test/test_osd_types.cc