From a37b46ae127b40184544f824239f75c3a1b5637a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 18 Feb 2015 11:42:18 -0800 Subject: [PATCH] build: fix Makefile inconsistencies (trivial) Summary: This is in preparation for some factorization. * Makefile (deletefile_test): Add $(COVERAGEFLAGS) to link command. (options_test): Remove explicit (redundant) dependency on options_helper.o: that is already a dependent, via $(LIBOBJECTS) Test Plan: run make Reviewers: sdong, ljin, igor Reviewed By: igor Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D33573 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d6cc6b5b1d..1e9fce4092 100644 --- a/Makefile +++ b/Makefile @@ -533,7 +533,7 @@ merger_test: table/merger_test.o $(LIBOBJECTS) $(TESTHARNESS) $(CXX) table/merger_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS) deletefile_test: db/deletefile_test.o $(LIBOBJECTS) $(TESTHARNESS) - $(CXX) db/deletefile_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) + $(CXX) db/deletefile_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS) geodb_test: utilities/geodb/geodb_test.o $(LIBOBJECTS) $(TESTHARNESS) $(CXX) utilities/geodb/geodb_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS) @@ -556,7 +556,7 @@ thread_list_test: util/thread_list_test.o $(LIBOBJECTS) $(TESTHARNESS) compactor_test: utilities/compaction/compactor_test.o $(LIBOBJECTS) $(TESTHARNESS) $(CXX) utilities/compaction/compactor_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS) -options_test: util/options_test.o util/options_helper.o $(LIBOBJECTS) $(TESTHARNESS) +options_test: util/options_test.o $(LIBOBJECTS) $(TESTHARNESS) $(CXX) util/options_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS) sst_dump_test: util/sst_dump_test.o $(LIBOBJECTS) $(TESTHARNESS)