diff options
| author | Sage Weil <sage@newdream.net> | 2012-02-28 09:30:38 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-02-28 09:30:47 -0800 |
| commit | fd0712dfb489d369eff9dbdb24b78d024aca855f (patch) | |
| tree | 4537322acb73210185544cf16c8e286e4d74e8df | |
| parent | a7de459f6937aaecfb9413db21b392780fe105fb (diff) | |
| download | ceph-fd0712dfb489d369eff9dbdb24b78d024aca855f.tar.gz | |
Makefile: drop separate libjson_spirit.la
automake seems to have difficulty with the .la dependency on another .la.
Since libjson_spirit.la is only used by libcommon.la anyway, just build it
directly into that. Sigh.
...
CXXLD libjson_spirit.la
AR libmds.a
CXXLD libcls_rbd.la
CXXLD libcls_rgw.la
CXXLD cephfs
CCLD test_ioctls
CC libcommon_la-ceph_ver.lo
CXX libcommon_la-version.lo
CXX ceph_dencoder.o
CCLD mount.ceph
CC ceph_ver.o
CXX test_libhadoopcephfs_build-version.o
CXXLD test_libhadoopcephfs_build
CXXLD libcommon.la
libtool: link: cannot find the library `libjson_spirit.la' or unhandled argument `libjson_spirit.la'
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | src/Makefile.am | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0d573bccbc5..e50078b7857 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -842,16 +842,10 @@ clean-local: # libs -libjson_spirit_la_SOURCES = \ - json_spirit/json_spirit_reader.cpp \ - json_spirit/json_spirit_writer.cpp \ - json_spirit/json_spirit_value.cpp -noinst_LTLIBRARIES += libjson_spirit.la - libcommon_la_SOURCES = $(libcommon_files) libcommon_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS} libcommon_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} -libcommon_la_LDFLAGS = -lrt libjson_spirit.la +libcommon_la_LDFLAGS = -lrt noinst_LTLIBRARIES += libcommon.la libglobal_la_SOURCES = \ @@ -911,6 +905,9 @@ libcommon_files = \ common/snap_types.cc \ common/str_list.cc \ common/errno.cc \ + json_spirit/json_spirit_reader.cpp \ + json_spirit/json_spirit_writer.cpp \ + json_spirit/json_spirit_value.cpp \ msg/SimpleMessenger.cc \ mon/MonCaps.cc \ mon/MonClient.cc \ |