Get things to compile. Addresses #1343.

git-svn-id: file:///svn/toku/tokudb.1032b+1343@8555 c7de825b-a66e-492c-adef-691d508d4ae1

include/Makefile.include

@@ -286,6 +286,9 @@ cscope.out: cscope.files $(TOKUROOT)*/*.[ch] $(TOKUROOT)*/*/*.[ch] $(TOKUROOT)*/
 .PHONY: clean clean-default
 clean: clean-default
 
+%.dir.clean:
+	$(MAYBEATSIGN)cd $* && $(MAKE) -k clean
+
 clean-default:
 	$(MAYBEATSIGN)rm -f $(BINS) *.$(AEXT) *.$(SOEXT) *.$(OEXT)
 	$(MAYBEATSIGN)rm -f *.bb *.bbg *.da *.gcov *.gcno *.gcda

src/tests/Makefile

@@ -42,7 +42,7 @@ BDB_DONTRUN_TESTS = \
 	manyfiles \
 	test938c \
 	helgrind1 \
-	helgrind 2\
+	helgrind2 \
 #\ ends prev line
 
 BDB_TESTS = $(patsubst %.c,%.bdb$(BINSUF),$(filter-out $(patsubst %,%.c,$(BDB_DONTRUN_TESTS)),$(SRCS)))

src/tests/test_set_func_malloc.c

@@ -10,7 +10,9 @@
 #include <toku_portability.h>
 #include <memory.h>
 #include <db.h>
+#ifdef USE_TDB
 #include <dlmalloc.h>
+#endif
 #include "test.h"
 
 static int malloc_counter=0;
@@ -78,6 +80,7 @@ test1 (void)
 	toku_free(x);	                        assert(malloc_counter==1 && free_counter==1 && realloc_counter==1);
     }
 
+#ifdef USE_TDB
     r = db_env_set_func_malloc(dlmalloc);   assert(r==0);
     r = db_env_set_func_realloc(dlrealloc); assert(r==0);
     r = db_env_set_func_free(dlfree);       assert(r==0);
@@ -87,7 +90,7 @@ test1 (void)
 	x = toku_realloc(x, 6);        assert(x);
 	toku_free(x);
     }
-
+#endif
 }
 
 int