X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/53f8c2c71e5962eeaccb80d04d2e0ff575d520fd..c66bf1fa32655ccf3f39b4cd72953459576463f5:/Makefile

diff --git a/Makefile b/Makefile
index 58afaa23..b72faa1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,58 +1,22 @@
-# Redis Makefile
-# Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
-# This file is released under the BSD license, see the COPYING file
+# Top level makefile, the real shit is at src/Makefile
 
-DEBUG?= -g
-CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -DSDS_ABORT_ON_OOM
-CCOPT= $(CFLAGS)
+TARGETS=32bit noopt test
 
-OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o
-BENCHOBJ = ae.o anet.o benchmark.o sds.o adlist.o zmalloc.o
-CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o
+all:
+	cd src && $(MAKE) $@
 
-PRGNAME = redis-server
-BENCHPRGNAME = redis-benchmark
-CLIPRGNAME = redis-cli
-
-all: redis-server redis-benchmark redis-cli
-
-# Deps (use make dep to generate this)
-adlist.o: adlist.c adlist.h
-ae.o: ae.c ae.h
-anet.o: anet.c anet.h
-benchmark.o: benchmark.c ae.h anet.h sds.h adlist.h
-dict.o: dict.c dict.h
-redis-cli.o: redis-cli.c anet.h sds.h adlist.h
-redis.o: redis.c ae.h sds.h anet.h dict.h adlist.h zmalloc.c zmalloc.h
-sds.o: sds.c sds.h
-sha1.o: sha1.c sha1.h
-zmalloc.o: zmalloc.c
-
-redis-server: $(OBJ)
-	$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
-	@echo ""
-	@echo "Hint: To run the test-redis.tcl script is a good idea."
-	@echo "Launch the redis server with ./redis-server, then in another"
-	@echo "terminal window enter this directory and run 'make test'."
-	@echo ""
-
-redis-benchmark: $(BENCHOBJ)
-	$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ)
-
-redis-cli: $(CLIOBJ)
-	$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
-
-.c.o:
-	$(CC) -c $(CCOPT) $(DEBUG) $(COMPILE_TIME) $<
+install: dummy
+	cd src && $(MAKE) $@
 
 clean:
-	rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o
+	cd src && $(MAKE) $@
+	cd deps/hiredis && $(MAKE) $@
+	cd deps/linenoise && $(MAKE) $@
 
-dep:
-	$(CC) -MM *.c
+$(TARGETS):
+	cd src && $(MAKE) $@
 
-test:
-	tclsh test-redis.tcl
+src/help.h:
+	@./utils/generate-command-help.rb > $@
 
-bench:
-	./redis-benchmark
+dummy: