non-blocking VM data structures, just a start

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index fdffde82c18f806cb83949e03fb9559e9c2cdc7f..50b328874dd69024f006365bbbace244d4d2fe30 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,18 @@
 # 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
 

+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
+  PTLINK?= -lpthread
+else
+  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W $(ARCH) $(PROF)
+  CCLINK?= -lm
+  PTLINK?= -lpthread
+endif
+CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)

 DEBUG?= -g -rdynamic -ggdb 
 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
 BENCHOBJ = ae.o anet.o benchmark.o sds.o adlist.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


@@ -18,7 +27,8 @@ all: redis-server redis-benchmark redis-cli
 
 # Deps (use make dep to generate this)
 adlist.o: adlist.c adlist.h zmalloc.h
 
 # Deps (use make dep to generate this)
 adlist.o: adlist.c adlist.h zmalloc.h

-ae.o: ae.c ae.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
 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


@@ -26,12 +36,13 @@ 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
 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
+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)
 sds.o: sds.c sds.h zmalloc.h
 zmalloc.o: zmalloc.c config.h
 
 redis-server: $(OBJ)

-       $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
+       $(CC) -o $(PRGNAME) $(CCOPT) $(PTLINK) $(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 ""
        @echo "Hint: To run the test-redis.tcl script is a good idea."
        @echo "Launch the redis server with ./redis-server, then in another"


@@ -45,14 +56,17 @@ redis-cli: $(CLIOBJ)
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 
 .c.o:
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 
 .c.o:

-       $(CC) -c $(CCOPT) $(DEBUG) $(COMPILE_TIME) $<
+       $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<

 
 clean:
 
 clean:

-       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o
+       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o *.gcda *.gcno *.gcov

 
 dep:
        $(CC) -MM *.c
 
 
 dep:
        $(CC) -MM *.c
 

+staticsymbols:
+       tclsh utils/build-static-symbols.tcl > staticsymbols.h
+

 test:
        tclsh test-redis.tcl
 
 test:
        tclsh test-redis.tcl
 


@@ -61,3 +75,15 @@ bench:
 
 log:
        git log '--pretty=format:%ad %s' --date=short > Changelog
 
 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"