mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
Closes #836
Fixes compile issues due to [3986] git-svn-id: file:///svn/tokudb@3995 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
parent
52b367b55c
commit
7d676f90d7
3 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue