top level Makefile now just a proxy. Doing make clean inside src now does a full...

diff --git a/Makefile b/Makefile
index 691843d49a1f1b372cc773f14e9aff6d2979bf23..4f08126df79d726f8cdb7758175d2ee45c042d71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,7 @@
 # Top level makefile, the real shit is at src/Makefile
 
 # Top level makefile, the real shit is at src/Makefile
 

-TARGETS=32bit noopt test
+default: all

 
 

-all:
+.DEFAULT:

        cd src && $(MAKE) $@
 
        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 d3567aa7d490fd1da6002ae0e5e7821db7585ae3..5354746bd0c7ae3b860b6926ecae653e11e76e69 100644 (file)
--- 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
 
 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
 
 dep:
        $(CC) -MM *.c -I ../deps/hiredis -I ../deps/linenoise


@@ -229,6 +233,9 @@ noopt:
 32bitgprof:
        $(MAKE) PROF="-pg" ARCH="-arch i386"
 
 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)
 install: all
        mkdir -p $(INSTALL_BIN)
        $(INSTALL) $(PRGNAME) $(INSTALL_BIN)