unstable merge conflicts resolved

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 711ef6ff7fba0ccea6cf17a658b7098ce112eeea..20c4f86efd7871c4336b006667aaad930c5d0fdd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,24 @@
 # Top level makefile, the real shit is at src/Makefile
 
-TARGETS=32bit noopt
+TARGETS=32bit noopt test
 
 all:
        cd src && $(MAKE) $@
 
-$(TARGETS) clean:
+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) $@
+
+$(TARGETS):
+       cd src && $(MAKE) $@
+
+src/help.h:
+       @./utils/generate-command-help.rb > $@
+
+dummy: