diff options
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | src/Makefile | 7 |
2 files changed, 9 insertions, 20 deletions
@@ -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 d3567aa7d..5354746bd 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) |