database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Code Activity

Revert "Addresses #1298"

Browse Source 
This reverts commit 5fa57d593d531a7ddc2f59afa4b082da46b00bbf.

git-svn-id: file:///svn/toku/tokudb@9229 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel
2013-04-16 23:57:40 -04:00
parent 74459586a0
commit f470a45bcf
10 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -16,21 +16,10 @@ db-benchmark-test.dir: src.dir
db-benchmark-test-cxx.dir: cxx.dir db-benchmark-test-cxx.dir: cxx.dir
utils.dir: src.dir utils.dir: src.dir
newbrt.cleandir: $(OS_CHOICE).cleandir
src.cleandir: newbrt.cleandir
cxx.cleandir: src.cleandir
db-benchmark-test.cleandir: src.cleandir
db-benchmark-test-cxx.cleandir: cxx.cleandir
utils.cleandir: src.cleandir
%.dir: %.dir:
cd $* && $(MAKE) build cd $(patsubst %.dir, %, $@) && $(MAKE) build
%.localdir:
cd $* && $(MAKE) local
build: $(patsubst %,%.dir, $(BUILDDIRS)) build: $(patsubst %,%.dir, $(BUILDDIRS))
local: $(patsubst %,%.localdir, $(BUILDDIRS))
CHECKS = $(patsubst %,%.checkdir,$(filter-out linux, $(SRCDIRS))) CHECKS = $(patsubst %,%.checkdir,$(filter-out linux, $(SRCDIRS)))

5
cxx/Makefile
View File

@@ -28,10 +28,7 @@ endif
LIBNAME = libtokudb_cxx LIBNAME = libtokudb_cxx
default: local default: install build
local: install build;
build: $(LIBNAME).a build: $(LIBNAME).a
if ! diff $(LIBNAME).a ../lib/$(LIBNAME).a >/dev/null 2>&1; then cp $< ../lib/; fi if ! diff $(LIBNAME).a ../lib/$(LIBNAME).a >/dev/null 2>&1; then cp $< ../lib/; fi
cd tests; $(MAKE) build cd tests; $(MAKE) build

3
db-benchmark-test-cxx/Makefile
View File

@@ -46,8 +46,7 @@ QUIET =
endif endif
default: build default: build
build: local; build: $(TARGETS)
local: $(TARGETS);
check: check-default check: check-default

5
db-benchmark-test/Makefile
View File

@@ -40,10 +40,7 @@ SCANSCAN_TDB = scanscan-tokudb$(BINSUF)
TARGETS = $(TARGET_BDB) $(SCANSCAN_BDB) $(TARGET_TDB) $(SCANSCAN_TDB) TARGETS = $(TARGET_BDB) $(SCANSCAN_BDB) $(TARGET_TDB) $(SCANSCAN_TDB)
default: build default: build
build: local; build: $(TARGETS)
local: $(TARGETS);
build.bdb: $(TARGET_BDB) $(SCANSCAN_BDB) build.bdb: $(TARGET_BDB) $(SCANSCAN_BDB)
build.tdb: $(TARGET_TDB) $(SCANSCAN_TDB) build.tdb: $(TARGET_TDB) $(SCANSCAN_TDB)

3
linux/Makefile
View File

@@ -21,5 +21,4 @@ clean:
rm -rf $(TARGET) $(LIBPORTABILITY) rm -rf $(TARGET) $(LIBPORTABILITY)
# For build, do nothing # For build, do nothing
local build:; build:

2
man/texi/Makefile
View File

@@ -7,7 +7,7 @@ SECTIONS = intro
SECTIONS_TEXI = $(patsubst %,%.texi,$(SECTIONS)) SECTIONS_TEXI = $(patsubst %,%.texi,$(SECTIONS))
default: $(MANPAGES_3) tokudb.dvi; default: $(MANPAGES_3) tokudb.dvi;
local build: default; build: default;
tokudb.dvi: tokudb.texi $(MANPAGES_TEXI) $(SECTIONS_TEXI) tokudb.dvi: tokudb.texi $(MANPAGES_TEXI) $(SECTIONS_TEXI)
texi2dvi4a2ps tokudb.texi texi2dvi4a2ps tokudb.texi

4
newbrt/Makefile
View File

@@ -31,11 +31,9 @@ BINS_O = $(patsubst %,%.$(OEXT),$(BINS_RAW))
.PHONY: build default bins libs .PHONY: build default bins libs
build default: local build default: bins libs $(TEST_NEWBRT)
cd tests;$(MAKE) build cd tests;$(MAKE) build
local: bins libs $(TEST_NEWBRT);
BRT_SOURCES = \ BRT_SOURCES = \
block_allocator \ block_allocator \
bread \ bread \

5
src/Makefile
View File

@@ -49,8 +49,7 @@ INSTALL_LIBRARIES= $(patsubst %,%.install,$(LIBRARIES))
#Half Build Half Install??? #Half Build Half Install???
build: local build_tests ; build: local build_tests ;
.PHONY: install local: buildlocktrees libs install_libs ;
local install: buildlocktrees libs install_libs ;
build_tests: | local build_tests: | local
cd tests && $(MAKE) build cd tests && $(MAKE) build
@@ -63,6 +62,8 @@ install_libs: $(INSTALL_LIBRARIES)
%.install: % %.install: %
if ! diff $* ../lib/$* > /dev/null 2>&1; then cp $* ../lib/; fi if ! diff $* ../lib/$* > /dev/null 2>&1; then cp $* ../lib/; fi
.PHONY: install
install: libs install_libs ;
.PHONY: local libs buildlocktrees .PHONY: local libs buildlocktrees
libs: $(LIBRARIES) ; libs: $(LIBRARIES) ;

3
utils/Makefile
View File

@@ -67,8 +67,7 @@ endif
.PHONY: all clean test test_gen test_gen_hex test_load test_dump .PHONY: all clean test test_gen test_gen_hex test_load test_dump
build all: local build all: $(UTILS) $(BDB_UTILS) $(STATIC_UTILS)
local: $(UTILS) $(BDB_UTILS) $(STATIC_UTILS);
coverage: $(UTILS) coverage: $(UTILS)

3
windows/Makefile
View File

@@ -22,6 +22,3 @@ $(TARGET): $(OBJS)
clean: clean:
rm -rf $(TARGET) $(LIBPORTABILITY) rm -rf $(TARGET) $(LIBPORTABILITY)
# For build, do nothing
local build:;