From f470a45bcf932e3ffdf48602d5fa77dba872778d Mon Sep 17 00:00:00 2001
From: Yoni Fogel <yoni@tokutek.com>
Date: Tue, 16 Apr 2013 23:57:40 -0400
Subject: [PATCH] Revert "Addresses #1298"

This reverts commit 5fa57d593d531a7ddc2f59afa4b082da46b00bbf.

git-svn-id: file:///svn/toku/tokudb@9229 c7de825b-a66e-492c-adef-691d508d4ae1
---
 Makefile                       | 13 +------------
 cxx/Makefile                   |  5 +----
 db-benchmark-test-cxx/Makefile |  3 +--
 db-benchmark-test/Makefile     |  5 +----
 linux/Makefile                 |  3 +--
 man/texi/Makefile              |  2 +-
 newbrt/Makefile                |  4 +---
 src/Makefile                   |  5 +++--
 utils/Makefile                 |  3 +--
 windows/Makefile               |  3 ---
 10 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index 855a8ab06d5..200f01f8392 100644
--- a/Makefile
+++ b/Makefile
@@ -16,21 +16,10 @@ db-benchmark-test.dir: src.dir
 db-benchmark-test-cxx.dir: cxx.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:
-	cd $* && $(MAKE) build
-
-%.localdir:
-	cd $* && $(MAKE) local
+	cd $(patsubst %.dir, %, $@) && $(MAKE) build
 
 build: $(patsubst %,%.dir, $(BUILDDIRS))
-local: $(patsubst %,%.localdir, $(BUILDDIRS))
 
 CHECKS = $(patsubst %,%.checkdir,$(filter-out linux, $(SRCDIRS)))
 
diff --git a/cxx/Makefile b/cxx/Makefile
index f351674703f..e551b6ca95e 100644
--- a/cxx/Makefile
+++ b/cxx/Makefile
@@ -28,10 +28,7 @@ endif
 
 LIBNAME = libtokudb_cxx
 
-default: local
-
-local: install build;
-
+default: install build
 build: $(LIBNAME).a
 	if ! diff $(LIBNAME).a ../lib/$(LIBNAME).a >/dev/null 2>&1; then cp $< ../lib/; fi
 	cd tests; $(MAKE) build
diff --git a/db-benchmark-test-cxx/Makefile b/db-benchmark-test-cxx/Makefile
index f8f449a3457..6dad6a05f2b 100644
--- a/db-benchmark-test-cxx/Makefile
+++ b/db-benchmark-test-cxx/Makefile
@@ -46,8 +46,7 @@ QUIET =
 endif
 
 default: build
-build: local;
-local: $(TARGETS);
+build: $(TARGETS)
 
 check: check-default
 
diff --git a/db-benchmark-test/Makefile b/db-benchmark-test/Makefile
index ba872c68854..d4d17e27a59 100644
--- a/db-benchmark-test/Makefile
+++ b/db-benchmark-test/Makefile
@@ -40,10 +40,7 @@ SCANSCAN_TDB = scanscan-tokudb$(BINSUF)
 TARGETS = $(TARGET_BDB) $(SCANSCAN_BDB) $(TARGET_TDB) $(SCANSCAN_TDB)
 
 default: build
-build: local;
-
-local: $(TARGETS);
-
+build: $(TARGETS) 
 build.bdb: $(TARGET_BDB) $(SCANSCAN_BDB)
 build.tdb: $(TARGET_TDB) $(SCANSCAN_TDB)
 
diff --git a/linux/Makefile b/linux/Makefile
index c43000ebbac..6a3a012ecd1 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -21,5 +21,4 @@ clean:
 	rm -rf $(TARGET) $(LIBPORTABILITY)
 
 # For build, do nothing
-local build:;
-
+build:
diff --git a/man/texi/Makefile b/man/texi/Makefile
index 18f90b98ac3..38ed7519b44 100644
--- a/man/texi/Makefile
+++ b/man/texi/Makefile
@@ -7,7 +7,7 @@ SECTIONS = intro
 SECTIONS_TEXI = $(patsubst %,%.texi,$(SECTIONS))
 
 default: $(MANPAGES_3) tokudb.dvi;
-local build: default;
+build: default;
 
 tokudb.dvi: tokudb.texi $(MANPAGES_TEXI) $(SECTIONS_TEXI)
 	texi2dvi4a2ps tokudb.texi
diff --git a/newbrt/Makefile b/newbrt/Makefile
index b31d8624b94..92158bb6aca 100644
--- a/newbrt/Makefile
+++ b/newbrt/Makefile
@@ -31,11 +31,9 @@ BINS_O = $(patsubst %,%.$(OEXT),$(BINS_RAW))
 
 .PHONY: build default bins libs
 
-build default: local
+build default: bins libs $(TEST_NEWBRT)
 	cd tests;$(MAKE) build
 
-local: bins libs $(TEST_NEWBRT);
-
 BRT_SOURCES = \
   block_allocator \
   bread \
diff --git a/src/Makefile b/src/Makefile
index 542572a1936..3fabf8bd39f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -49,8 +49,7 @@ INSTALL_LIBRARIES= $(patsubst %,%.install,$(LIBRARIES))
 #Half Build Half Install???
 build: local build_tests ;
 
-.PHONY: install
-local install: buildlocktrees libs install_libs ;
+local: buildlocktrees libs install_libs ;
 
 build_tests: | local
 	cd tests && $(MAKE) build
@@ -63,6 +62,8 @@ install_libs: $(INSTALL_LIBRARIES)
 %.install: %
 	if ! diff $* ../lib/$* > /dev/null 2>&1; then cp $* ../lib/; fi
 
+.PHONY: install
+install: libs install_libs ;
 
 .PHONY: local libs buildlocktrees
 libs: $(LIBRARIES) ;
diff --git a/utils/Makefile b/utils/Makefile
index de240b4e5e8..b69888f4774 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -67,8 +67,7 @@ endif
 
 .PHONY: all clean test test_gen test_gen_hex test_load test_dump
 
-build all: local
-local: $(UTILS) $(BDB_UTILS) $(STATIC_UTILS);
+build all: $(UTILS) $(BDB_UTILS) $(STATIC_UTILS)
 
 coverage: $(UTILS)
 
diff --git a/windows/Makefile b/windows/Makefile
index b2f44ec18f3..dfc835b9a78 100644
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -22,6 +22,3 @@ $(TARGET): $(OBJS)
 clean:
 	rm -rf $(TARGET) $(LIBPORTABILITY)
 
-# For build, do nothing
-local build:;
-