diff --git a/db-benchmark-test/Makefile b/db-benchmark-test/Makefile index 6afe93dea0e..f43d6f70b02 100644 --- a/db-benchmark-test/Makefile +++ b/db-benchmark-test/Makefile @@ -60,7 +60,7 @@ OFILES = \ ../src/ydb.o ../src/errors.o ../src/elocks.o \ ../newbrt/brt.o ../newbrt/brt-serialize.o ../newbrt/brt-verify.o ../newbrt/cachetable.o ../newbrt/fifo.o ../newbrt/key.o ../newbrt/memory.o ../newbrt/mempool.o ../newbrt/gpma.o ../newbrt/leafentry.o ../newbrt/ybt.o ../newbrt/primes.o ../newbrt/log.o ../newbrt/fingerprint.o ../newbrt/log_code.o ../newbrt/roll.o ../newbrt/toku_assert.o ../newbrt/recover.o \ ../src/lock_tree/locktree.o ../src/lock_tree/rth.o ../src/lock_tree/lth.o ../src/lock_tree/idlth.o ../src/lock_tree/db_id.o \ - ../src/range_tree/rangetree.o ../src/range_tree/tokuredblack.o + ../src/range_tree/rangetree.o db-benchmark-test-tokudb: db-benchmark-test.c $(CC) $(CFLAGS) $(TDB_CPPFLAGS) $(OFILES) -lz $< -o $@ -DDIRSUF=tokudb else diff --git a/src/Makefile b/src/Makefile index d772489b4bf..d3bb36de301 100644 --- a/src/Makefile +++ b/src/Makefile @@ -78,7 +78,7 @@ DBBINS = ydb.o errors.o elocks.o ../newbrt/newbrt.o TDBBINS = tdbtrace.o $(patsubst ydb.o,ydbtrace.o,$(DBBINS)) -RANGETREE_BINS = range_tree/rangetree.o range_tree/tokuredblack.o +RANGETREE_BINS = range_tree/rangetree.o LOCKTREE_BINS = lock_tree/locktree.o lock_tree/rth.o lock_tree/lth.o lock_tree/idlth.o lock_tree/db_id.o $(RANGETREE_BINS) $(LIBRARY): $(DBBINS) | buildlocktrees diff --git a/src/range_tree/Makefile.include b/src/range_tree/Makefile.include index 727113cc7c2..5b6556c0bf6 100644 --- a/src/range_tree/Makefile.include +++ b/src/range_tree/Makefile.include @@ -1,3 +1,3 @@ -RANGETREE_FILES = log_nooverlap tokuredblack +RANGETREE_FILES = log_nooverlap RANGETREE_HERE = $(ROOT)src/range_tree -RANGETREE_HEADERS = rangetree rangetree-internal tokuredblack +RANGETREE_HEADERS = rangetree rangetree-internal