From 7d838856cf15cf4ae8e7820e5e2b9710721bb23e Mon Sep 17 00:00:00 2001
From: Igor Canadi <icanadi@fb.com>
Date: Tue, 15 Apr 2014 15:59:34 -0700
Subject: [PATCH] Fix compile issues when doing make release

---
 Makefile            | 15 +++++++--------
 db/db_impl.h        |  2 +-
 db/db_impl_debug.cc |  4 ++--
 3 files changed, 10 insertions(+), 11 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 {} \;
diff --git a/db/db_impl.h b/db/db_impl.h
index ecf30e1a9..5bc495400 100644
--- a/db/db_impl.h
+++ b/db/db_impl.h
@@ -146,7 +146,7 @@ class DBImpl : public DB {
                              int output_level, const Slice* begin,
                              const Slice* end);
 
-#ifndef NDEBUG
+#ifndef ROCKSDB_LITE
   // Extra methods (for testing) that are not in the public DB interface
   // Implemented in db_impl_debug.cc
 
diff --git a/db/db_impl_debug.cc b/db/db_impl_debug.cc
index 6736fe81b..346692beb 100644
--- a/db/db_impl_debug.cc
+++ b/db/db_impl_debug.cc
@@ -7,7 +7,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#ifndef NDEBUG
+#ifndef ROCKSDB_LITE
 
 #include "db/db_impl.h"
 
@@ -119,4 +119,4 @@ Status DBImpl::TEST_WaitForCompact() {
   return bg_error_;
 }
 }  // namespace rocksdb
-#endif  // NDEBUG
+#endif  // ROCKSDB_LITE