Partial qsort implemented in SORT command, only when both BY and LIMIT is used. minor...

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index bf9760f06fdee501e9de972a269974f79692cc89..00c0f226c69c33f08487307712b36659b626b314 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 # This file is released under the BSD license, see the COPYING file
 
 DEBUG?= -g
-CFLAGS?= -O2 -Wall -W -DSDS_ABORT_ON_OOM
+CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -DSDS_ABORT_ON_OOM
 CCOPT= $(CFLAGS)
 
-OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o
+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
 
@@ -23,7 +23,7 @@ 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
+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
@@ -56,3 +56,6 @@ test:
 
 bench:
        ./redis-benchmark
+
+log:
+       git log '--pretty=format:%ad %s' --date=short > Changelog