unstable merge conflicts resolved

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index f67909456435ea0038a4ae560dd4ad02c4432584..20c4f86efd7871c4336b006667aaad930c5d0fdd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,17 @@ all:
 install: dummy
        cd src && $(MAKE) $@
 
-$(TARGETS) clean:
+clean:
        cd src && $(MAKE) $@
+       cd deps/hiredis && $(MAKE) $@
+       cd deps/linenoise && $(MAKE) $@
+       cd deps/jemalloc && $(MAKE) distclean
+       cd deps/lua && $(MAKE) $@
+
+$(TARGETS):
+       cd src && $(MAKE) $@
+
+src/help.h:
+       @./utils/generate-command-help.rb > $@
 
 dummy: