RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: fix lib dependencies

Browse Source 
libceph and librados should link libcrush.  Users of
libceph|librados need not link libcrush.
This commit is contained in:
Sage Weil 2009-10-28 15:31:50 -07:00
parent 44bab24dc1
commit 3e781bbc8c
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/control vendored
View File

@ -131,7 +131,7 @@ Description: debugging symbols for librados1
Package: librados1-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libcrush1, librados1
Depends: ${shlibs:Depends}, ${misc:Depends}, librados1
Description: RADOS distributed object store client library (development files)
RADOS is a reliable, autonomic distributed object storage cluster
developed as part of the Ceph distributed storage system. This is a
@ -166,7 +166,7 @@ Description: debugging symbols for libceph1
Package: libceph1-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libcrush1
Depends: ${shlibs:Depends}, ${misc:Depends}, libceph1
Description: Ceph distributed file system client library (development files)
Ceph is a distributed network file system designed to provide
excellent performance, reliability, and scalability. This is a
@ -178,7 +178,7 @@ Description: Ceph distributed file system client library (development files)
Package: radosgw
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libexpat1, libcrush1, librados1
Depends: ${shlibs:Depends}, ${misc:Depends}, libexpat1, librados1
Description: REST gateway for RADOS distributed object store
RADOS is a distributed object store used by the Ceph distributed
storage system. This package provides a REST gateway to the

17
src/Makefile.am
View File

@ -108,7 +108,7 @@ libcrush_la_SOURCES = \
crush/crush.c
libcrush_la_CFLAGS = ${AM_CFLAGS}
libcrush_la_CXXFLAGS = ${AM_CXXFLAGS}
libcrush_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'crush_.*'
libcrush_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'crush_.*' -lm
lib_LTLIBRARIES += libcrush.la
# libceph
@ -117,12 +117,11 @@ libceph_la_SOURCES = \
client/Client.cc \
msg/SimpleMessenger.cc \
${libcommon_a_SOURCES} \
${libcrush_a_SOURCES} \
${libosdc_a_SOURCES}
libceph_la_CFLAGS = ${AM_CFLAGS}
libceph_la_CXXFLAGS= ${AM_CXXFLAGS}
libceph_la_LIBADD = libcrush.la
libceph_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
libceph_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^ceph_.*' -lpthread
lib_LTLIBRARIES += libceph.la
testceph_SOURCES = client/testceph.cc
@ -139,7 +138,7 @@ librados_la_SOURCES = ${librados_SOURCES}
librados_la_CFLAGS = ${AM_CFLAGS}
librados_la_CXXFLAGS = ${AM_CXXFLAGS}
librados_la_LIBADD = libcrush.la
librados_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^rados_.*'
librados_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^rados_.*' -lpthread
lib_LTLIBRARIES += librados.la
librados_a_SOURCES = ${librados_SOURCES}
@ -147,15 +146,15 @@ librados_a_CFLAGS = ${AM_CFLAGS}
librados_a_CXXFLAGS = ${AM_CXXFLAGS}
rados_SOURCES = rados.cc
rados_LDADD = librados.la libcrush.la -lpthread -lm
rados_LDADD = librados.la -lpthread -lm
bin_PROGRAMS += rados
testrados_SOURCES = testrados.c
testrados_LDADD = librados.la libcrush.la -lpthread -lm
testrados_LDADD = librados.la -lpthread -lm
testradospp_SOURCES = testradospp.cc
testradospp_LDADD = librados.la libcrush.la -lpthread -lm
testradospp_LDADD = librados.la -lpthread -lm
radosacl_SOURCES = radosacl.cc
radosacl_LDADD = librados.la libcrush.la -lpthread -lm
radosacl_LDADD = librados.la -lpthread -lm
bin_PROGRAMS += testrados testradospp radosacl
if WITH_RADOSGW
@ -202,7 +201,7 @@ BUILT_SOURCES += libcls_acl.so
if WITH_HADOOPCLIENT
JAVA_BASE = /usr/lib/jvm/java-6-sun
libhadoopcephfs_la_SOURCES = client/hadoop/CephFSInterface.cc
libhadoopcephfs_la_LIBADD = libceph.la libcrush.la
libhadoopcephfs_la_LIBADD = libceph.la
libhadoopcephfs_la_CFLAGS = ${AM_CFLAGS}
libhadoopcephfs_la_CXXFLAGS = ${AM_CXXFLAGS}
libhadoopcephfs_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'hadoopcephfs_.*'