Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 335f8321300b50798f055a0a0795ef0c5180c928..4f08126df79d726f8cdb7758175d2ee45c042d71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +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/lua && $(MAKE) $@
-
-$(TARGETS):
-       cd src && $(MAKE) $@
-
-src/help.h:
-       @./utils/generate-command-help.rb > $@
-
-dummy: