diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-07 13:31:29 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-07 13:31:29 -0700 |
| commit | 624e084ac0a198112d66fedbeb55f27d9cb9648f (patch) | |
| tree | eb6fc71e4f6ba9c261afd81f41b02f3834f3db77 | |
| parent | 13e42447f49a6bc279cf2eaa0d3b5d0b59adc7d9 (diff) | |
| parent | c17d13493785eb1de9bbc4545f461e44aafa72c6 (diff) | |
| download | ceph-624e084ac0a198112d66fedbeb55f27d9cb9648f.tar.gz | |
Merge pull request #572 from roaldvanloon/wip-fix-buildtests
fix: build tests need libcrc.la
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d93e63c4c4e..236ea51e375 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -299,23 +299,23 @@ bin_DEBUGPROGRAMS += ceph_multi_stress_watch if WITH_BUILD_TESTS ceph_test_libcommon_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) -ceph_test_libcommon_build_LDADD = $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_libcommon_build_LDADD = libcrc.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) bin_DEBUGPROGRAMS += ceph_test_libcommon_build ceph_test_librados_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) $(librados_SOURCES) -ceph_test_librados_build_LDADD = $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_librados_build_LDADD = libcrc.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) ceph_test_librados_build_CXXFLAGS = $(AM_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_librados_build ceph_test_librgw_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) \ $(librados_SOURCES) $(librgw_la_SOURCES) -ceph_test_librgw_build_LDADD = -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_librgw_build_LDADD = libcrc.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) ceph_test_librgw_build_CXXFLAGS = $(AM_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_librgw_build ceph_test_libcephfs_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) \ $(libosdc_la_SOURCES) -ceph_test_libcephfs_build_LDADD = libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_libcephfs_build_LDADD = libcrc.la libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) ceph_test_libcephfs_build_CXXFLAGS = $(AM_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_libcephfs_build endif @@ -324,7 +324,7 @@ if WITH_HADOOPCLIENT ceph_test_libhadoopcephfs_build_SOURCES = test/test_libcommon_build.cc \ $(libhadoopcephfs_la_SOURCES) \ $(libosdc_la_SOURCES) $(libcommon_files) -ceph_test_libhadoopcephfs_build_LDADD = libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_libhadoopcephfs_build_LDADD = libcrc.la libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) ceph_test_libhadoopcephfs_build_CXXFLAGS = $(AM_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_libhadoopcephfs_build endif |