From dcef9fb9bdd1c203b7924f912bbe5e934343a81b Mon Sep 17 00:00:00 2001 From: Xing Lin Date: Sun, 10 Nov 2013 17:13:07 -0700 Subject: [PATCH] automake: replaced hardcoded '-lboost_program_options' with a macro replaced '-lboost_program_options' with the BOOST_PROGRAM_OPTIONS_LIBS macro in related Makefile.am files Signed-off-by: Xing Lin --- src/test/Makefile.am | 10 +++++----- src/tools/Makefile.am | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index da9f33b3d42d2..b1cbf9fac9902 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -130,7 +130,7 @@ ceph_smalliobench_SOURCES = \ test/bench/rados_backend.cc \ test/bench/detailed_stat_collector.cc \ test/bench/bencher.cc -ceph_smalliobench_LDADD = $(LIBRADOS) -lboost_program_options $(CEPH_GLOBAL) +ceph_smalliobench_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_smalliobench ceph_smalliobenchfs_SOURCES = \ @@ -138,7 +138,7 @@ ceph_smalliobenchfs_SOURCES = \ test/bench/testfilestore_backend.cc \ test/bench/detailed_stat_collector.cc \ test/bench/bencher.cc -ceph_smalliobenchfs_LDADD = $(LIBRADOS) -lboost_program_options $(LIBOS) $(CEPH_GLOBAL) +ceph_smalliobenchfs_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBOS) $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_smalliobenchfs ceph_smalliobenchdumb_SOURCES = \ @@ -146,7 +146,7 @@ ceph_smalliobenchdumb_SOURCES = \ test/bench/dumb_backend.cc \ test/bench/detailed_stat_collector.cc \ test/bench/bencher.cc -ceph_smalliobenchdumb_LDADD = $(LIBRADOS) -lboost_program_options $(LIBOS) $(CEPH_GLOBAL) +ceph_smalliobenchdumb_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBOS) $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_smalliobenchdumb ceph_smalliobenchrbd_SOURCES = \ @@ -154,13 +154,13 @@ ceph_smalliobenchrbd_SOURCES = \ test/bench/rbd_backend.cc \ test/bench/detailed_stat_collector.cc \ test/bench/bencher.cc -ceph_smalliobenchrbd_LDADD = $(LIBRBD) $(LIBRADOS) -lboost_program_options $(CEPH_GLOBAL) +ceph_smalliobenchrbd_LDADD = $(LIBRBD) $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_smalliobenchrbd ceph_tpbench_SOURCES = \ test/bench/tp_bench.cc \ test/bench/detailed_stat_collector.cc -ceph_tpbench_LDADD = $(LIBRADOS) -lboost_program_options $(LIBOS) $(CEPH_GLOBAL) +ceph_tpbench_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBOS) $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_tpbench ceph_omapbench_SOURCES = test/omap_bench.cc diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 89417014dd464..44dff92b1624b 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,9 +1,9 @@ ceph_osdomap_tool_SOURCES = tools/ceph-osdomap-tool.cc -ceph_osdomap_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) -lboost_program_options +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) -lboost_program_options +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 @@ -13,7 +13,7 @@ bin_DEBUGPROGRAMS += ceph-kvstore-tool ceph_filestore_dump_SOURCES = tools/ceph-filestore-dump.cc -ceph_filestore_dump_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) -lboost_program_options +ceph_filestore_dump_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) if LINUX ceph_filestore_dump_LDADD += -ldl endif # LINUX -- 2.39.5