a few more stuff in INFO about VM. Test #11 changed a bit in order to be less lame

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 330df7502965cdba7adbf147381b03f8f4e0bf3a..f3aff26263e5a23cae649146b9e526e985f6bc74 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,15 @@
 # This file is released under the BSD license, see the COPYING file
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 # This file is released under the BSD license, see the COPYING file
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')

+OPTIMIZATION?=-O2

 ifeq ($(uname_S),SunOS)
 ifeq ($(uname_S),SunOS)

-  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -D__EXTENSIONS__ -D_XPG6
-  CCLINK?= -ldl -lnsl -lsocket -lm
+  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
+  CCLINK?= -ldl -lnsl -lsocket -lm -lpthread

 else
 else

-  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W
-  CCLINK?= -lm
+  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
+  CCLINK?= -lm -pthread

 endif
 endif

-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH)
+CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)

 DEBUG?= -g -rdynamic -ggdb 
 
 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o
 DEBUG?= -g -rdynamic -ggdb 
 
 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o


@@ -25,7 +26,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


@@ -33,7 +35,8 @@ 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
 
 sds.o: sds.c sds.h zmalloc.h
 zmalloc.o: zmalloc.c config.h
 


@@ -55,11 +58,14 @@ redis-cli: $(CLIOBJ)
        $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
 
 clean:
        $(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
 
 
 dep:
        $(CC) -MM *.c
 

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

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


@@ -71,3 +77,15 @@ log:
 
 32bit:
        make ARCH="-arch i386"
 
 32bit:
        make ARCH="-arch i386"

+
+gprof:
+       make PROF="-pg"
+
+gcov:
+       make PROF="-fprofile-arcs -ftest-coverage"
+
+noopt:
+       make OPTIMIZATION=""
+
+32bitgprof:
+       make PROF="-pg" ARCH="-arch i386"