]>
Commit | Line | Data |
---|---|---|
250e33c5 JB |
1 | --- ceph-0.58/src/Makefile.am.orig 2013-03-05 00:01:56.000000000 +0100 |
2 | +++ ceph-0.58/src/Makefile.am 2013-03-08 22:33:39.131959554 +0100 | |
3 | @@ -56,7 +56,7 @@ | |
041b9abb PS |
4 | EXTRALIBS += -lprofiler |
5 | endif | |
6 | ||
7 | -LIBGLOBAL_LDA = libglobal.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) | |
8 | +LIBGLOBAL_LDA = libglobal.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system | |
9 | ||
10 | LIBOS_LDA = libos.a | |
11 | ||
250e33c5 | 12 | @@ -146,7 +146,7 @@ |
2a1a6301 JR |
13 | bin_PROGRAMS += cephfs |
14 | ||
15 | librados_config_SOURCES = librados-config.cc | |
250e33c5 JB |
16 | -librados_config_LDADD = libglobal.la librados.la $(PTHREAD_LIBS) $(EXTRALIBS) $(CRYPTO_LIBS) |
17 | +librados_config_LDADD = librados.la $(LIBGLOBAL_LDA) $(PTHREAD_LIBS) $(EXTRALIBS) $(CRYPTO_LIBS) | |
2a1a6301 JR |
18 | bin_PROGRAMS += librados-config |
19 | ||
20 | # synthetic client | |
250e33c5 | 21 | @@ -313,7 +313,7 @@ |
d7e6592a | 22 | libcephfs_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS} |
4f42482b | 23 | libcephfs_la_CXXFLAGS= ${AM_CXXFLAGS} |
29b2f8e9 | 24 | libcephfs_la_LIBADD = libclient.la |
d7e6592a PS |
25 | -libcephfs_la_LDFLAGS = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) \ |
26 | +libcephfs_la_LDFLAGS = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system \ | |
27 | ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*' | |
28 | lib_LTLIBRARIES += libcephfs.la | |
29 | ||
250e33c5 | 30 | @@ -335,7 +335,7 @@ |
041b9abb PS |
31 | librados_la_SOURCES = ${librados_SOURCES} |
32 | librados_la_CFLAGS = ${CRYPTO_CFLAGS} ${AM_CFLAGS} | |
4f42482b | 33 | librados_la_CXXFLAGS = ${AM_CXXFLAGS} |
041b9abb PS |
34 | -librados_la_LIBADD = libcommon.la $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) |
35 | +librados_la_LIBADD = libcommon.la $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system | |
36 | librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 -export-symbols-regex '^rados_.*' | |
37 | lib_LTLIBRARIES += librados.la | |
38 |