New vararg BLPOP able to block against multiple keys

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index cb09c911f6d6e6f97fcfece77156cc78301b820f..c036e10cd5d180419185191da54432ce6cfb96d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,18 @@
 # 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 -O2 -Wall -W -DSDS_ABORT_ON_OOM
-CCOPT= $(CFLAGS)
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ifeq ($(uname_S),SunOS)
+  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -D__EXTENSIONS__ -D_XPG6
+  CCLINK?= -ldl -lnsl -lsocket -lm
+else
+  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W $(ARCH) $(PROF)
+  CCLINK?= -lm
+endif
+CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
+DEBUG?= -g -rdynamic -ggdb 
 
-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
 
@@ -17,16 +24,20 @@ 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 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 ae_select.c ae_epoll.c
+ae_select.o: ae_select.c
+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 config.h redis.h ae.h sds.h anet.h dict.h \
+  adlist.h zmalloc.h lzf.h pqsort.h staticsymbols.h
+sds.o: sds.c sds.h zmalloc.h
+zmalloc.o: zmalloc.c config.h
 
 redis-server: $(OBJ)
        $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
@@ -43,14 +54,17 @@ redis-cli: $(CLIOBJ)
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 
 .c.o:
-       $(CC) -c $(CCOPT) $(DEBUG) $(COMPILE_TIME) $<
+       $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
 
 clean:
-       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o
+       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o *.gcda *.gcno *.gcov
 
 dep:
        $(CC) -MM *.c
 
+staticsymbols:
+       tclsh utils/build-static-symbols.tcl > staticsymbols.h
+
 test:
        tclsh test-redis.tcl
 
@@ -59,3 +73,15 @@ bench:
 
 log:
        git log '--pretty=format:%ad %s' --date=short > Changelog
+
+32bit:
+       make ARCH="-arch i386"
+
+gprof:
+       make PROF="-pg"
+
+gcov:
+       make PROF="-fprofile-arcs -ftest-coverage"
+
+32bitgprof:
+       make PROF="-pg" ARCH="-arch i386"