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

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 185aab8d2038f404c6f5f8143859ca2e03bed2a2..4f08126df79d726f8cdb7758175d2ee45c042d71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +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) $@
-
-$(TARGETS):
-       cd src && $(MAKE) $@
-
-dummy: