Commit a773e6d0 authored by Yoni Fogel's avatar Yoni Fogel

Closes #1106

Uses  instead of make.
This helps if make is aliased

git-svn-id: file:///svn/tokudb@5729 c7de825b-a66e-492c-adef-691d508d4ae1
parent 9c3edb74
...@@ -114,7 +114,7 @@ check: bins ...@@ -114,7 +114,7 @@ check: bins
check-fanout: check-fanout:
let BRT_FANOUT=4; \ let BRT_FANOUT=4; \
while [ $$BRT_FANOUT -le 16 ] ;do \ while [ $$BRT_FANOUT -le 16 ] ;do \
make clean; make check BRT_FANOUT=$$BRT_FANOUT; \ $(MAKE) clean; $(MAKE) check BRT_FANOUT=$$BRT_FANOUT; \
let BRT_FANOUT=BRT_FANOUT+1; \ let BRT_FANOUT=BRT_FANOUT+1; \
done done
......
...@@ -44,7 +44,7 @@ check: ...@@ -44,7 +44,7 @@ check:
clean: clean:
rm -rf $(BINS) $(LT_BINS) rm -rf $(BINS) $(LT_BINS)
rm -rf *.gcno *.gcda *.gcov rm -rf *.gcno *.gcda *.gcov
cd tests && make clean cd tests && $(MAKE) clean
locktree.o: $(LT_TLOG) locktree.o: $(LT_TLOG)
cp $< $@ cp $< $@
......
...@@ -37,7 +37,7 @@ install: $(BINS) ...@@ -37,7 +37,7 @@ install: $(BINS)
clean: clean:
rm -rf *.o *.gcno *.gcda *.gcov rm -rf *.o *.gcno *.gcda *.gcov
cd tests && make clean cd tests && $(MAKE) clean
rangetree.o: log_nooverlap.o rangetree.o: log_nooverlap.o
cp $< $@ cp $< $@
......
...@@ -93,7 +93,7 @@ LOG_BINS = ../log.o ../../../newbrt/newbrt.o ...@@ -93,7 +93,7 @@ LOG_BINS = ../log.o ../../../newbrt/newbrt.o
HEADERS=../rangetree.h ../rangetree-internal.h test.h HEADERS=../rangetree.h ../rangetree-internal.h test.h
../../../newbrt/newbrt.o: ../../../newbrt/newbrt.o:
cd ../../../newbrt && make cd ../../../newbrt && $(MAKE)
%.lin: %.c $(HEADERS) $(LINEAR_BINS) %.lin: %.c $(HEADERS) $(LINEAR_BINS)
$(CC) -DDIR=\"dir.$<.lin\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINEAR_BINS) $(CC) -DDIR=\"dir.$<.lin\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINEAR_BINS)
......
...@@ -134,7 +134,7 @@ test_groupcommit_perf.bdbrun test_groupcommit_perf.tdbrun: VGRIND= ...@@ -134,7 +134,7 @@ test_groupcommit_perf.bdbrun test_groupcommit_perf.tdbrun: VGRIND=
libs: libs:
cd ..;make cd ..;$(MAKE)
%.bdb: %.c %.bdb: %.c
$(UNSETTOKUENV) $(CC) -DENVDIR=\"dir.$<.bdb\" $(BDB_CPPFLAGS) -DUSE_BDB -DIS_TDB=0 $(CFLAGS) $< $(BDB_LDFLAGS) -ldb -o $@ $(UNSETTOKUENV) $(CC) -DENVDIR=\"dir.$<.bdb\" $(BDB_CPPFLAGS) -DUSE_BDB -DIS_TDB=0 $(CFLAGS) $< $(BDB_LDFLAGS) -ldb -o $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment