Use string2ll in ziplist code (faster)

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index bf9760f06fdee501e9de972a269974f79692cc89..b72faa1b18c88b8a491deca9d9ebe5e3c1a95f64 100644 (file)
--- 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?= -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
-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:
 
 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: