undoed all the sds hacking that lead just to random bugs and no memory saving ;)

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 1d4b4e7419a09dac9e27c8e24b547efa4a1a3a15..fdffde82c18f806cb83949e03fb9559e9c2cdc7f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
 # Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
 # This file is released under the BSD license, see the COPYING file
 
 # Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
 # This file is released under the BSD license, see the COPYING file
 

-DEBUG?= -g
-CFLAGS?= -std=c99 -pedantic -O -Wall -W -DSDS_ABORT_ON_OOM
+DEBUG?= -g -rdynamic -ggdb 
+CFLAGS?= -std=c99 -O2 -pedantic -Wall -W

 CCOPT= $(CFLAGS)
 
 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o
 CCOPT= $(CFLAGS)
 
 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o


@@ -17,16 +17,18 @@ CLIPRGNAME = redis-cli
 all: redis-server redis-benchmark redis-cli
 
 # Deps (use make dep to generate this)
 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
+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)
 
 redis-server: $(OBJ)
        $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)