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

diff --git a/src/brag/Makefile.am b/src/brag/Makefile.am
index 35c735baf8fec7ae297f9d8a54f9bd57957761ad..32456b01c751c18a9fb36cce295c540113fa1fda 100644 (file)
--- a/src/brag/Makefile.am
+++ b/src/brag/Makefile.am
@@ -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

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 53107eba51742529b8a2b03a440e311bc6b86c9d..60dd2278fdce1b0db9acfaeab82b544cfe05e30d 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -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

diff --git a/src/erasure-code/Makefile.am b/src/erasure-code/Makefile.am
index 3390bacfa7f93c5d6122dbe7d2f2c88b6e91a8e9..7b178b087c4785adeda5d8428a303a0d36c960b4 100644 (file)
--- a/src/erasure-code/Makefile.am
+++ b/src/erasure-code/Makefile.am
@@ -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

diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index 4b3d1fb751bc31989b1545b6e36e13ac8d516679..5481e64bd4f99410c48a120f5cd34e5d3dd6c27c 100644 (file)
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -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

diff --git a/src/key_value_store/Makefile.am b/src/key_value_store/Makefile.am
index c4b854f2bd43c0ee460f0c4d36f354bce9e274bc..1ccf50ef70129687cfb5db102711b88be5d0df68 100644 (file)
--- a/src/key_value_store/Makefile.am
+++ b/src/key_value_store/Makefile.am
@@ -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

diff --git a/src/librados/Makefile.am b/src/librados/Makefile.am
index 8e6de3fcd200ffeb0b02ff72a0036da79e6de01a..103ffd8aad85b5254992655c79668491d7849bce 100644 (file)
--- a/src/librados/Makefile.am
+++ b/src/librados/Makefile.am
@@ -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

diff --git a/src/libradosstriper/Makefile.am b/src/libradosstriper/Makefile.am
index ad0ebb56b3369b59f0be94cd8f9f03f6c31cda42..bd4c1d159550555d9af3ac3c8a84bd163033a85c 100644 (file)
--- a/src/libradosstriper/Makefile.am
+++ b/src/libradosstriper/Makefile.am
@@ -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

diff --git a/src/librbd/Makefile.am b/src/librbd/Makefile.am
index a4b21d97db1313e2c0478e76b3b48426236f243e..96d0a00ce30c7ee3b454b3ae6a5e718898323126 100644 (file)
--- a/src/librbd/Makefile.am
+++ b/src/librbd/Makefile.am
@@ -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

diff --git a/src/mds/Makefile.am b/src/mds/Makefile.am
index f64318e607b2d3b07481271b1cbdf093221eaae7..f00b3f19198178b24c849c077b67dc39d67a0ab2 100644 (file)
--- a/src/mds/Makefile.am
+++ b/src/mds/Makefile.am
@@ -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

diff --git a/src/mon/Makefile.am b/src/mon/Makefile.am
index 6016355b1cbcb20b09573151e8b15f518b2dd4c8..8c9694486882b3c43e042958147bc6b094e6e301 100644 (file)
--- a/src/mon/Makefile.am
+++ b/src/mon/Makefile.am
@@ -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

diff --git a/src/os/Makefile.am b/src/os/Makefile.am
index d12adbaf06d01d44515a0e307bbcd6a80042932c..2638810ededea1029145e972b505aa03d4c2a9b7 100644 (file)
--- a/src/os/Makefile.am
+++ b/src/os/Makefile.am
@@ -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

diff --git a/src/osd/Makefile.am b/src/osd/Makefile.am
index 2338f18773d5a339e4fa5dfbae1192096d9935c3..7998d4d4ea3b32f36245f0afbaefc6b5125c573e 100644 (file)
--- a/src/osd/Makefile.am
+++ b/src/osd/Makefile.am
@@ -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

diff --git a/src/rbd_replay/Makefile.am b/src/rbd_replay/Makefile.am
index f1f406f243504338e8d3bf565e2980268f75f18c..fa101b7423fdc8f6adb74d3eb0279cb42120c477 100644 (file)
--- a/src/rbd_replay/Makefile.am
+++ b/src/rbd_replay/Makefile.am
@@ -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

diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index 06e56c6928381395cd888b361dd336ca86ba41a1..3e5c913a5c4d3d390a0d3da9451013ac0b799b28 100644 (file)
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -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

diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
index 62e782fbad69b7dc1d7aec249faceb646b794870..1a25630dc70cdc766f964ef881afa7f1ba30c198 100644 (file)
--- a/src/test/erasure-code/Makefile.am
+++ b/src/test/erasure-code/Makefile.am
@@ -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

diff --git a/src/test/messenger/Makefile.am b/src/test/messenger/Makefile.am
index 1449cbc9f77026bcc070e53a91816aaac42bc47e..9fe2416614ab2625c0d3f36bbd743cef7f7a7520 100644 (file)
--- a/src/test/messenger/Makefile.am
+++ b/src/test/messenger/Makefile.am
@@ -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