From e3a7ab7a1cb28f6798843951bbc07f74004214a8 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 5 Mar 2015 20:45:17 +0100 Subject: [PATCH] Split Makefile.am in src/tools --- src/tools/Makefile-client.am | 34 ++++++++++++++++++ src/tools/Makefile-server.am | 52 +++++++++++++++++++++++++++ src/tools/Makefile.am | 69 ++++-------------------------------- 3 files changed, 92 insertions(+), 63 deletions(-) create mode 100644 src/tools/Makefile-client.am create mode 100644 src/tools/Makefile-server.am diff --git a/src/tools/Makefile-client.am b/src/tools/Makefile-client.am new file mode 100644 index 0000000000000..b1b43dec9ea84 --- /dev/null +++ b/src/tools/Makefile-client.am @@ -0,0 +1,34 @@ +if WITH_RADOS + +ceph_scratchtool_SOURCES = tools/scratchtool.c +ceph_scratchtool_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) +bin_DEBUGPROGRAMS += ceph_scratchtool + +ceph_scratchtoolpp_SOURCES = tools/scratchtoolpp.cc +ceph_scratchtoolpp_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) +bin_DEBUGPROGRAMS += ceph_scratchtoolpp + +ceph_radosacl_SOURCES = tools/radosacl.cc +ceph_radosacl_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) +bin_DEBUGPROGRAMS += ceph_radosacl + +rados_SOURCES = \ + tools/rados/rados.cc \ + tools/rados/rados_import.cc \ + tools/rados/rados_export.cc \ + tools/rados/rados_sync.cc +rados_SOURCES += common/obj_bencher.cc # needs cleanup so it can go in libcommon.la +rados_LDADD = libcls_lock_client.la $(LIBRADOS) $(CEPH_GLOBAL) +bin_PROGRAMS += rados + + +if WITH_CEPHFS + +ceph_client_debug_SOURCES = tools/ceph-client-debug.cc +ceph_client_debug_LDADD = $(LIBCEPHFS) $(CEPH_GLOBAL) $(LIBCOMMON) +bin_DEBUGPROGRAMS += ceph-client-debug + +endif # WITH_CEPHFS + + +endif # WITH_RADOS diff --git a/src/tools/Makefile-server.am b/src/tools/Makefile-server.am new file mode 100644 index 0000000000000..12d22f011da4a --- /dev/null +++ b/src/tools/Makefile-server.am @@ -0,0 +1,52 @@ +ceph_osdomap_tool_SOURCES = tools/ceph_osdomap_tool.cc +ceph_osdomap_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) +bin_DEBUGPROGRAMS += ceph-osdomap-tool + +ceph_monstore_tool_SOURCES = tools/ceph_monstore_tool.cc +ceph_monstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) +bin_DEBUGPROGRAMS += ceph-monstore-tool + +ceph_kvstore_tool_SOURCES = tools/ceph_kvstore_tool.cc +ceph_kvstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) +ceph_kvstore_tool_CXXFLAGS = $(UNITTEST_CXXFLAGS) +bin_DEBUGPROGRAMS += ceph-kvstore-tool + + +if WITH_OSD + +ceph_objectstore_tool_SOURCES = tools/ceph_objectstore_tool.cc +ceph_objectstore_tool_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBRADOS) +if LINUX +ceph_objectstore_tool_LDADD += -ldl +endif # LINUX +bin_PROGRAMS += ceph-objectstore-tool + +endif # WITH_OSD + + +if WITH_MDS +if ENABLE_CLIENT +if WITH_RADOS + +cephfs_journal_tool_SOURCES = \ + tools/cephfs/cephfs-journal-tool.cc \ + tools/cephfs/JournalTool.cc \ + tools/cephfs/JournalFilter.cc \ + tools/cephfs/JournalScanner.cc \ + tools/cephfs/EventOutput.cc \ + tools/cephfs/Dumper.cc \ + tools/cephfs/Resetter.cc \ + tools/cephfs/MDSUtility.cc +cephfs_journal_tool_LDADD = $(LIBMDS) $(LIBRADOS) $(CEPH_GLOBAL) +bin_PROGRAMS += cephfs-journal-tool + +cephfs_table_tool_SOURCES = \ + tools/cephfs/cephfs-table-tool.cc \ + tools/cephfs/TableTool.cc \ + tools/cephfs/MDSUtility.cc +cephfs_table_tool_LDADD = $(LIBMDS) $(LIBRADOS) $(CEPH_GLOBAL) +bin_PROGRAMS += cephfs-table-tool + +endif # WITH_RADOS +endif # ENABLE_CLIENT +endif # WITH_MDS diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index ae4ddf0d4d62a..5b725f4a0cd93 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,22 +1,10 @@ -ceph_osdomap_tool_SOURCES = tools/ceph_osdomap_tool.cc -ceph_osdomap_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) -bin_DEBUGPROGRAMS += ceph-osdomap-tool +if ENABLE_CLIENT +include Makefile-client.am +endif -ceph_monstore_tool_SOURCES = tools/ceph_monstore_tool.cc -ceph_monstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) -bin_DEBUGPROGRAMS += ceph-monstore-tool - -ceph_kvstore_tool_SOURCES = tools/ceph_kvstore_tool.cc -ceph_kvstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) -ceph_kvstore_tool_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph-kvstore-tool - -ceph_objectstore_tool_SOURCES = tools/ceph_objectstore_tool.cc -ceph_objectstore_tool_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBRADOS) -if LINUX -ceph_objectstore_tool_LDADD += -ldl -endif # LINUX -bin_PROGRAMS += ceph-objectstore-tool +if ENABLE_SERVER +include Makefile-server.am +endif monmaptool_SOURCES = tools/monmaptool.cc monmaptool_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON) @@ -30,54 +18,10 @@ osdmaptool_SOURCES = tools/osdmaptool.cc osdmaptool_LDADD = $(CEPH_GLOBAL) bin_PROGRAMS += osdmaptool -ceph_scratchtool_SOURCES = tools/scratchtool.c -ceph_scratchtool_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_scratchtool - -ceph_scratchtoolpp_SOURCES = tools/scratchtoolpp.cc -ceph_scratchtoolpp_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_scratchtoolpp - ceph_psim_SOURCES = tools/psim.cc ceph_psim_LDADD = $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_psim -ceph_radosacl_SOURCES = tools/radosacl.cc -ceph_radosacl_LDADD = $(LIBRADOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_radosacl - -ceph_client_debug_SOURCES = tools/ceph-client-debug.cc -ceph_client_debug_LDADD = $(LIBCEPHFS) $(CEPH_GLOBAL) $(LIBCOMMON) -bin_DEBUGPROGRAMS += ceph-client-debug - -rados_SOURCES = \ - tools/rados/rados.cc \ - tools/rados/rados_import.cc \ - tools/rados/rados_export.cc \ - tools/rados/rados_sync.cc -rados_SOURCES += common/obj_bencher.cc # needs cleanup so it can go in libcommon.la -rados_LDADD = libcls_lock_client.la $(LIBRADOS) $(CEPH_GLOBAL) -bin_PROGRAMS += rados - -cephfs_journal_tool_SOURCES = \ - tools/cephfs/cephfs-journal-tool.cc \ - tools/cephfs/JournalTool.cc \ - tools/cephfs/JournalFilter.cc \ - tools/cephfs/JournalScanner.cc \ - tools/cephfs/EventOutput.cc \ - tools/cephfs/Dumper.cc \ - tools/cephfs/Resetter.cc \ - tools/cephfs/MDSUtility.cc -cephfs_journal_tool_LDADD = $(LIBMDS) $(LIBRADOS) $(CEPH_GLOBAL) -bin_PROGRAMS += cephfs-journal-tool - -cephfs_table_tool_SOURCES = \ - tools/cephfs/cephfs-table-tool.cc \ - tools/cephfs/TableTool.cc \ - tools/cephfs/MDSUtility.cc -cephfs_table_tool_LDADD = $(LIBMDS) $(LIBRADOS) $(CEPH_GLOBAL) -bin_PROGRAMS += cephfs-table-tool - if WITH_REST_BENCH rest_bench_SOURCES = tools/rest_bench.cc rest_bench_SOURCES += common/obj_bencher.cc # needs cleanup so it can go in libcommon.la @@ -111,4 +55,3 @@ noinst_HEADERS += \ tools/cephfs/TableTool.h \ tools/cephfs/MDSUtility.h \ tools/rados/rados_sync.h - -- 2.39.5