diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-09 15:39:35 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-09 15:39:35 -0700 |
| commit | 04120360e311150101f71fe202fbc00c05bd284c (patch) | |
| tree | 606cee4dab8f78c73646207814484482132970d3 | |
| parent | 4c5b3c7beef572c463e570fbba2ee3ac99219f02 (diff) | |
| parent | 132e4039380fb8859437b5e86ad6518d36eb16f7 (diff) | |
| download | ceph-04120360e311150101f71fe202fbc00c05bd284c.tar.gz | |
Merge pull request #581 from dachary/master
autoconf: use $(LIBOSD) $(LIBCOMMON) instead of libosd.a libcommon.la
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/test/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
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 |