From 3daf6ea96dd730de645d77cf69d2a5115a6a5d43 Mon Sep 17 00:00:00 2001 From: "Roald J. van Loon" Date: Sat, 7 Sep 2013 15:33:10 +0200 Subject: [PATCH] automake cleanup: moving misc tools to tools subdir Signed-off-by: Roald J. van Loon --- src/Makefile.am | 22 +++++++++++----------- src/{ => tools}/ceph_authtool.cc | 0 src/{ => tools}/ceph_conf.cc | 0 src/{ => tools}/crushtool.cc | 0 src/{ => tools}/dupstore.cc | 0 src/{ => tools}/mon_store_converter.cc | 0 src/{ => tools}/monmaptool.cc | 0 src/{ => tools}/osdmaptool.cc | 0 src/{ => tools}/psim.cc | 0 src/{ => tools}/radosacl.cc | 0 src/{ => tools}/scratchtool.c | 0 src/{ => tools}/scratchtoolpp.cc | 0 12 files changed, 11 insertions(+), 11 deletions(-) rename src/{ => tools}/ceph_authtool.cc (100%) rename src/{ => tools}/ceph_conf.cc (100%) rename src/{ => tools}/crushtool.cc (100%) rename src/{ => tools}/dupstore.cc (100%) rename src/{ => tools}/mon_store_converter.cc (100%) rename src/{ => tools}/monmaptool.cc (100%) rename src/{ => tools}/osdmaptool.cc (100%) rename src/{ => tools}/psim.cc (100%) rename src/{ => tools}/radosacl.cc (100%) rename src/{ => tools}/scratchtool.c (100%) rename src/{ => tools}/scratchtoolpp.cc (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 9a2317537cbc..634d5245ac6d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -86,7 +86,7 @@ ceph_mon_LDADD = libmon.a $(LIBOS_LDA) $(LIBGLOBAL_LDA) ceph_mon_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} bin_PROGRAMS += ceph-mon -ceph_mon_store_converter_SOURCES = mon_store_converter.cc \ +ceph_mon_store_converter_SOURCES = tools/mon_store_converter.cc \ mon/MonitorStore.cc ceph_mon_store_converter_LDFLAGS = ${AM_LDFLAGS} ceph_mon_store_converter_LDADD = $(LIBOS_LDA) $(LIBGLOBAL_LDA) @@ -112,10 +112,10 @@ ceph_mds_CXXFLAGS = ${AM_CXXFLAGS} # admin tools -ceph_conf_SOURCES = ceph_conf.cc +ceph_conf_SOURCES = tools/ceph_conf.cc ceph_conf_LDADD = $(LIBGLOBAL_LDA) ceph_conf_CXXFLAGS = ${AM_CXXFLAGS} -ceph_authtool_SOURCES = ceph_authtool.cc +ceph_authtool_SOURCES = tools/ceph_authtool.cc ceph_authtool_LDADD = $(LIBGLOBAL_LDA) ceph_filestore_dump_SOURCES = tools/ceph-filestore-dump.cc ceph_filestore_dump_SOURCES += perfglue/disabled_heap_profiler.cc @@ -139,11 +139,11 @@ ceph_monstore_tool_LDADD = $(LIBOS_LDA) $(LIBGLOBAL_LDA) -lboost_program_option ceph_monstore_tool_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} bin_DEBUGPROGRAMS += ceph-monstore-tool -monmaptool_SOURCES = monmaptool.cc +monmaptool_SOURCES = tools/monmaptool.cc monmaptool_LDADD = $(LIBGLOBAL_LDA) -crushtool_SOURCES = crushtool.cc +crushtool_SOURCES = tools/crushtool.cc crushtool_LDADD = $(LIBGLOBAL_LDA) -osdmaptool_SOURCES = osdmaptool.cc +osdmaptool_SOURCES = tools/osdmaptool.cc osdmaptool_LDADD = $(LIBGLOBAL_LDA) bin_PROGRAMS += monmaptool crushtool osdmaptool @@ -227,7 +227,7 @@ ceph_mon_SOURCES += perfglue/disabled_heap_profiler.cc endif # WITH_TCMALLOC # debug targets -ceph_psim_SOURCES = psim.cc +ceph_psim_SOURCES = tools/psim.cc ceph_psim_LDADD = $(LIBGLOBAL_LDA) bin_DEBUGPROGRAMS += ceph_psim @@ -246,7 +246,7 @@ bin_DEBUGPROGRAMS += ceph_test_msgr ceph_test_ioctls_SOURCES = client/test_ioctls.c bin_DEBUGPROGRAMS += ceph_test_ioctls -ceph_dupstore_SOURCES = dupstore.cc +ceph_dupstore_SOURCES = tools/dupstore.cc ceph_dupstore_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} ceph_dupstore_LDADD = $(LIBOS_LDA) $(LIBGLOBAL_LDA) ceph_streamtest_SOURCES = test/streamtest.cc @@ -500,11 +500,11 @@ endif endif -ceph_scratchtool_SOURCES = scratchtool.c +ceph_scratchtool_SOURCES = tools/scratchtool.c ceph_scratchtool_LDADD = librados.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) -ceph_scratchtoolpp_SOURCES = scratchtoolpp.cc +ceph_scratchtoolpp_SOURCES = tools/scratchtoolpp.cc ceph_scratchtoolpp_LDADD = librados.la $(PTHREAD_LIBS) -lm -ceph_radosacl_SOURCES = radosacl.cc +ceph_radosacl_SOURCES = tools/radosacl.cc ceph_radosacl_LDADD = librados.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) bin_DEBUGPROGRAMS += ceph_scratchtool ceph_scratchtoolpp ceph_radosacl diff --git a/src/ceph_authtool.cc b/src/tools/ceph_authtool.cc similarity index 100% rename from src/ceph_authtool.cc rename to src/tools/ceph_authtool.cc diff --git a/src/ceph_conf.cc b/src/tools/ceph_conf.cc similarity index 100% rename from src/ceph_conf.cc rename to src/tools/ceph_conf.cc diff --git a/src/crushtool.cc b/src/tools/crushtool.cc similarity index 100% rename from src/crushtool.cc rename to src/tools/crushtool.cc diff --git a/src/dupstore.cc b/src/tools/dupstore.cc similarity index 100% rename from src/dupstore.cc rename to src/tools/dupstore.cc diff --git a/src/mon_store_converter.cc b/src/tools/mon_store_converter.cc similarity index 100% rename from src/mon_store_converter.cc rename to src/tools/mon_store_converter.cc diff --git a/src/monmaptool.cc b/src/tools/monmaptool.cc similarity index 100% rename from src/monmaptool.cc rename to src/tools/monmaptool.cc diff --git a/src/osdmaptool.cc b/src/tools/osdmaptool.cc similarity index 100% rename from src/osdmaptool.cc rename to src/tools/osdmaptool.cc diff --git a/src/psim.cc b/src/tools/psim.cc similarity index 100% rename from src/psim.cc rename to src/tools/psim.cc diff --git a/src/radosacl.cc b/src/tools/radosacl.cc similarity index 100% rename from src/radosacl.cc rename to src/tools/radosacl.cc diff --git a/src/scratchtool.c b/src/tools/scratchtool.c similarity index 100% rename from src/scratchtool.c rename to src/tools/scratchtool.c diff --git a/src/scratchtoolpp.cc b/src/tools/scratchtoolpp.cc similarity index 100% rename from src/scratchtoolpp.cc rename to src/tools/scratchtoolpp.cc -- 2.47.3