RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes in other Makefile.am files to make them support the build refinement

Browse Source
This commit is contained in:
Boris Ranto 2015-03-06 15:19:53 +01:00
parent 0f04633985
commit 96c685ee8f
16 changed files with 90 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/brag/Makefile.am
View File

@ -1,3 +1,4 @@
if ENABLE_CLIENT
bin_SCRIPTS += brag/client/ceph-brag
EXTRA_DIST += brag/server brag/README.md brag/client
endif # ENABLE_CLIENT

2
src/client/Makefile.am
View File

@ -1,3 +1,4 @@
if ENABLE_CLIENT
libclient_la_SOURCES = \
client/Client.cc \
client/Inode.cc \
@ -33,3 +34,4 @@ endif
ceph_test_ioctls_SOURCES = client/test_ioctls.c
bin_DEBUGPROGRAMS += ceph_test_ioctls
endif # ENABLE_CLIENT

6
src/erasure-code/Makefile.am
View File

@ -1,3 +1,6 @@
if ENABLE_SERVER
if WITH_OSD
## erasure code plugins
erasure_codelibdir = $(pkglibdir)/erasure-code
@ -24,3 +27,6 @@ noinst_HEADERS += \
erasure-code/ErasureCode.h \
erasure-code/ErasureCodeInterface.h \
erasure-code/ErasureCodePlugin.h
endif # WITH_OSD -- nothing else needs it
endif # ENABLE_SERVER

8
src/java/Makefile.am
View File

@ -22,6 +22,9 @@ JAVA_TEST_SRC = \
EXTRA_DIST = $(JAVA_SRC) $(JAVA_TEST_SRC)
if ENABLE_CLIENT
if WITH_RADOS
if WITH_CEPHFS
if ENABLE_CEPHFS_JAVA
JAVA_CLASSES = $(JAVA_SRC:java/%.java=%.class)
@ -78,4 +81,7 @@ java_DATA += libcephfs-test.jar
CLEANFILES += test/com/ceph/fs/*.class libcephfs-test.jar
endif # HAVE_JUNIT4 (includes WITH_DEBUG)
endif #ENABLE_CEPHFS_JAVA
endif # ENABLE_CEPHFS_JAVA
endif # WITH_CEPHFS
endif # WITH_RADOS
endif # ENABLE_CLIENT

5
src/key_value_store/Makefile.am
View File

@ -1,3 +1,6 @@
if ENABLE_SERVER
if WITH_OSD
if LINUX
libcls_kvs_la_SOURCES = key_value_store/cls_kvs.cc
libcls_kvs_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
@ -10,3 +13,5 @@ noinst_HEADERS += \
key_value_store/kv_flat_btree_async.h \
key_value_store/kvs_arg_types.h
endif # WITH_OSD
endif # ENABLE_SERVER

6
src/librados/Makefile.am
View File

@ -1,3 +1,6 @@
if ENABLE_CLIENT
if WITH_RADOS
librados_internal_la_SOURCES = \
librados/RadosClient.cc \
librados/IoCtxImpl.cc \
@ -40,3 +43,6 @@ noinst_HEADERS += \
librados/RadosClient.h \
librados/RadosXattrIter.h \
librados/ListObjectImpl.h
endif # WITH_RADOS
endif # ENABLE_CLIENT

8
src/libradosstriper/Makefile.am
View File

@ -1,3 +1,7 @@
if ENABLE_CLIENT
if WITH_RADOS
if WITH_RADOSSTRIPER
libradosstriper_la_SOURCES = \
libradosstriper/libradosstriper.cc \
libradosstriper/RadosStriperImpl.cc \
@ -17,3 +21,7 @@ lib_LTLIBRARIES += libradosstriper.la
noinst_HEADERS += \
libradosstriper/RadosStriperImpl.h \
libradosstriper/MultiAioCompletionImpl.h
endif # WITH_RADOSSTRIPER
endif # WITH_RADOS
endif # ENABLE_CLIENT

8
src/librbd/Makefile.am
View File

@ -2,6 +2,10 @@ librbd_types_la_SOURCES = \
librbd/WatchNotifyTypes.cc
noinst_LTLIBRARIES += librbd_types.la
if ENABLE_CLIENT
if WITH_RADOS
if WITH_RBD
librbd_internal_la_SOURCES = \
librbd/AioCompletion.cc \
librbd/AioRequest.cc \
@ -63,3 +67,7 @@ noinst_HEADERS += \
librbd/SnapInfo.h \
librbd/TaskFinisher.h \
librbd/WatchNotifyTypes.h
endif # WITH_RBD
endif # WITH_RADOS
endif # ENABLE_CLIENT

6
src/mds/Makefile.am
View File

@ -1,3 +1,6 @@
if ENABLE_SERVER
if WITH_MDS
libmds_la_SOURCES = \
mds/Capability.cc \
mds/MDS.cc \
@ -91,4 +94,5 @@ noinst_HEADERS += \
mds/events/ETableServer.h \
mds/events/EUpdate.h
endif # WITH_MDS
endif # ENABLE_SERVER

5
src/mon/Makefile.am
View File

@ -2,6 +2,9 @@ libmon_types_la_SOURCES = \
mon/PGMap.cc
noinst_LTLIBRARIES += libmon_types.la
if ENABLE_SERVER
if WITH_MON
libmon_la_SOURCES = \
mon/Monitor.cc \
mon/Paxos.cc \
@ -47,3 +50,5 @@ noinst_HEADERS += \
mon/Session.h \
mon/mon_types.h
endif # WITH_MON
endif # ENABLE_SERVER

4
src/os/Makefile.am
View File

@ -3,6 +3,8 @@ libos_types_la_SOURCES = \
libos_types_la_CXXFLAGS = ${AM_CXXFLAGS}
noinst_LTLIBRARIES += libos_types.la
if ENABLE_SERVER
libos_la_SOURCES = \
os/chain_xattr.cc \
os/DBObjectMap.cc \
@ -99,3 +101,5 @@ libos_la_CXXFLAGS += -std=gnu++11
libos_la_LIBADD += -lkinetic_client -lprotobuf -lglog -lgflags libcrypto.a
noinst_HEADERS += os/KineticStore.h
endif
endif # ENABLE_SERVER

11
src/osd/Makefile.am
View File

@ -5,6 +5,9 @@ libosd_types_la_SOURCES = \
libosd_types_la_CXXFLAGS = ${AM_CXXFLAGS}
noinst_LTLIBRARIES += libosd_types.la
if ENABLE_SERVER
if WITH_OSD
libosd_la_SOURCES = \
osd/PG.cc \
osd/ReplicatedPG.cc \
@ -25,6 +28,9 @@ libosd_la_SOURCES = \
objclass/class_api.cc
libosd_la_CXXFLAGS = ${AM_CXXFLAGS}
if WITH_KINETIC
libosd_la_CXXFLAGS += -std=gnu++11
endif
libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) $(LIBOSD_TYPES) $(LIBOS_TYPES)
if WITH_LTTNG
libosd_la_LIBADD += $(LIBOSD_TP)
@ -54,6 +60,5 @@ noinst_HEADERS += \
osd/Watch.h \
osd/osd_types.h
if WITH_KINETIC
libosd_la_CXXFLAGS += -std=gnu++11
endif
endif # WITH_OSD
endif # ENABLE_SERVER

8
src/rbd_replay/Makefile.am
View File

@ -1,3 +1,7 @@
if ENABLE_CLIENT
if WITH_RADOS
if WITH_RBD
# librbd_replay_la exists only to help with unit tests
librbd_replay_la_SOURCES = rbd_replay/actions.cc \
rbd_replay/Deser.cc \
@ -51,3 +55,7 @@ rbd_replay_prep_LDADD = $(LIBRBD) \
if WITH_BABELTRACE
bin_PROGRAMS += rbd-replay-prep
endif
endif # WITH_RBD
endif # WITH_RADOS
endif # ENABLE_CLIENT

10
src/rgw/Makefile.am
View File

@ -1,4 +1,7 @@
if ENABLE_CLIENT
if WITH_RADOS
if WITH_RADOSGW
librgw_la_SOURCES = \
rgw/librgw.cc \
rgw/rgw_acl.cc \
@ -104,9 +107,6 @@ DENCODER_SOURCES += \
rgw/rgw_json_enc.cc
endif # WITH_RADOSGW
noinst_HEADERS += \
rgw/logrotate.conf \
rgw/rgw_acl.h \
@ -163,3 +163,7 @@ noinst_HEADERS += \
civetweb/civetweb.h \
civetweb/include/civetweb.h \
civetweb/src/md5.h
endif # WITH_RADOSGW
endif # WITH_RADOS
endif # ENABLE_CLIENT

6
src/test/erasure-code/Makefile.am
View File

@ -1,3 +1,6 @@
if ENABLE_SERVER
if WITH_OSD
check_SCRIPTS += \
test/erasure-code/test-erasure-code.sh
@ -232,3 +235,6 @@ noinst_HEADERS += test/erasure-code/ErasureCodeExample.h
unittest_erasure_code_example_CXXFLAGS = $(UNITTEST_CXXFLAGS)
unittest_erasure_code_example_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
check_PROGRAMS += unittest_erasure_code_example
endif # WITH_OSD
endif # ENABLE_SERVER

4
src/test/messenger/Makefile.am
View File

@ -1,3 +1,4 @@
if ENABLE_SERVER
if ENABLE_XIO
noinst_HEADERS += \
@ -71,4 +72,5 @@ noinst_PROGRAMS += \
xio_server \
xio_client
endif
endif # ENABLE_XIO
endif # ENABLE_SERVER