replication slave timeout when receiving the initial bulk data set to 3600 seconds...

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index e45899e9108020d8d71534b0135ce00b847d5a95..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
 
@@ -56,3 +56,6 @@ test:
 
 bench:
        ./redis-benchmark
+
+log:
+       git log '--pretty=format:%ad %s' --date=short > Changelog