Fix overflow in mstime() in redis-cli and benchmark.

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index fda703e1e2d74ae40c438ab13897761961d22572..e614ede891f2dd183a3ae41ea1ac3b63fe2e7634 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,63 +1,11 @@
-# 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 -rdynamic -ggdb 
-CFLAGS?= -std=c99 -pedantic -O0 -Wall -W -DSDS_ABORT_ON_OOM
-CCOPT= $(CFLAGS)
+default: all
 
-OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.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
+.DEFAULT:
+       cd src && $(MAKE) $@
 
-PRGNAME = redis-server
-BENCHPRGNAME = redis-benchmark
-CLIPRGNAME = redis-cli
+install:
+       cd src && $(MAKE) $@
 
-all: redis-server redis-benchmark redis-cli
-
-# Deps (use make dep to generate this)
-adlist.o: adlist.c adlist.h zmalloc.h
-ae.o: ae.c ae.h zmalloc.h
-anet.o: anet.c fmacros.h anet.h
-benchmark.o: benchmark.c fmacros.h ae.h anet.h sds.h adlist.h zmalloc.h
-dict.o: dict.c fmacros.h dict.h zmalloc.h
-lzf_c.o: lzf_c.c lzfP.h
-lzf_d.o: lzf_d.c lzfP.h
-pqsort.o: pqsort.c
-redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h
-redis.o: redis.c fmacros.h ae.h sds.h anet.h dict.h adlist.h zmalloc.h lzf.h pqsort.h config.h
-sds.o: sds.c sds.h zmalloc.h
-zmalloc.o: zmalloc.c config.h
-
-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) $<
-
-clean:
-       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o
-
-dep:
-       $(CC) -MM *.c
-
-test:
-       tclsh test-redis.tcl
-
-bench:
-       ./redis-benchmark
-
-log:
-       git log '--pretty=format:%ad %s' --date=short > Changelog
+.PHONY: install