From: antirez <antirez@gmail.com>
Date: Wed, 13 Jul 2011 17:15:22 +0000 (+0200)
Subject: top level Makefile now just a proxy. Doing make clean inside src now does a full... 
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/319bb48c01b4c5be95b425e325d4b9ae46d4bced?hp=5cb4850708d7ad9c035e7ee9534b05bb1b0e9d94

top level Makefile now just a proxy. Doing make clean inside src now does a full clean including deps, not just Redis source. Thanks to Pieter for the top level Makefile proxy trick.
---

diff --git a/Makefile b/Makefile
index 691843d4..4f08126d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,7 @@
 # Top level makefile, the real shit is at src/Makefile
 
-TARGETS=32bit noopt test
+default: all
 
-all:
+.DEFAULT:
 	cd src && $(MAKE) $@
 
-install: dummy
-	cd src && $(MAKE) $@
-
-clean:
-	cd src && $(MAKE) $@
-	cd deps/hiredis && $(MAKE) $@
-	cd deps/linenoise && $(MAKE) $@
-	cd deps/jemalloc && $(MAKE) distclean
-	cd deps/lua && $(MAKE) $@
-	-(cd deps/jemalloc && $(MAKE) distclean)
-
-$(TARGETS):
-	cd src && $(MAKE) $@
-
-src/help.h:
-	@./utils/generate-command-help.rb > $@
-
-dummy:
diff --git a/src/Makefile b/src/Makefile
index d3567aa7..5354746b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -198,6 +198,10 @@ redis-check-aof: $(CHECKAOFOBJ)
 
 clean:
 	rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov
+	cd ../deps/hiredis && $(MAKE) $@
+	cd ../deps/linenoise && $(MAKE) $@
+	cd ../deps/lua && $(MAKE) $@
+	-(cd ../deps/jemalloc && $(MAKE) distclean)
 
 dep:
 	$(CC) -MM *.c -I ../deps/hiredis -I ../deps/linenoise
@@ -229,6 +233,9 @@ noopt:
 32bitgprof:
 	$(MAKE) PROF="-pg" ARCH="-arch i386"
 
+src/help.h:
+	@../utils/generate-command-help.rb > help.h
+
 install: all
 	mkdir -p $(INSTALL_BIN)
 	$(INSTALL) $(PRGNAME) $(INSTALL_BIN)