summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIgor Canadi <icanadi@fb.com>2014-04-15 15:59:34 -0700
committerIgor Canadi <icanadi@fb.com>2014-04-15 16:00:10 -0700
commit7d838856cf15cf4ae8e7820e5e2b9710721bb23e (patch)
tree01661d2ca4d67ec7a804797358b16b582566e3cf /Makefile
parent0f40fe4bc71d53346027fa8d1a12815c25dbd19a (diff)
Fix compile issues when doing make release
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index b57018c5c..f0f94026a 100644
--- a/Makefile
+++ b/Makefile
@@ -118,8 +118,7 @@ TOOLS = \
db_repl_stress \
blob_store_bench
-
-PROGRAMS = db_bench signal_test table_reader_bench $(TESTS) $(TOOLS)
+PROGRAMS = db_bench signal_test table_reader_bench $(TOOLS)
BENCHMARKS = db_bench_sqlite3 db_bench_tree_db table_reader_bench
# The library name is configurable since we are maintaining libraries of both
@@ -165,18 +164,18 @@ endif # PLATFORM_SHARED_EXT
release tags valgrind_check whitebox_crash_test format static_lib shared_lib all \
dbg
-all: $(LIBRARY) $(PROGRAMS)
+all: $(LIBRARY) $(PROGRAMS) $(TESTS)
static_lib: $(LIBRARY)
shared_lib: $(SHARED)
-dbg: $(LIBRARY) $(PROGRAMS)
+dbg: $(LIBRARY) $(PROGRAMS) $(TESTS)
-# Will also generate shared libraries.
+# creates static library and programs
release:
$(MAKE) clean
- OPT="-DNDEBUG -O2" $(MAKE) all -j32
+ OPT="-DNDEBUG -O2" $(MAKE) static_lib $(PROGRAMS) -j32
coverage:
$(MAKE) clean
@@ -189,7 +188,7 @@ check: $(PROGRAMS) $(TESTS) $(TOOLS)
for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done
python tools/ldb_test.py
-ldb_tests: all $(PROGRAMS) $(TOOLS)
+ldb_tests: all $(PROGRAMS) $(TESTS) $(TOOLS)
python tools/ldb_test.py
crash_test: blackbox_crash_test whitebox_crash_test
@@ -225,7 +224,7 @@ valgrind_check: all $(PROGRAMS) $(TESTS)
done
clean:
- -rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) build_config.mk
+ -rm -f $(PROGRAMS) $(TESTS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) build_config.mk
-rm -rf ios-x86/* ios-arm/*
-find . -name "*.[od]" -exec rm {} \;
-find . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm {} \;