support for include directive in config parser

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 43d273237e50493cced8687c62bb7626e60650c1..df840313f13cfb335d0a1a6b8d8184e7dc218c13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,37 +3,47 @@
 # 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
+  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
+  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 
 
 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
-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 zipmap.o
+BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o

 CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o
 CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o

+CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o

 
 PRGNAME = redis-server
 BENCHPRGNAME = redis-benchmark
 CLIPRGNAME = redis-cli
 
 PRGNAME = redis-server
 BENCHPRGNAME = redis-benchmark
 CLIPRGNAME = redis-cli

+CHECKDUMPPRGNAME = redis-check-dump

 
 

-all: redis-server redis-benchmark redis-cli
+all: redis-server redis-benchmark redis-cli redis-check-dump

 
 # 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 config.h ae_kqueue.c
+ae_epoll.o: ae_epoll.c
+ae_kqueue.o: ae_kqueue.c
+ae_select.o: ae_select.c

 anet.o: anet.c fmacros.h anet.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
 lzf_c.o: lzf_c.c lzfP.h
 lzf_d.o: lzf_d.c lzfP.h
 pqsort.o: pqsort.c
 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-benchmark.o: redis-benchmark.c fmacros.h ae.h anet.h sds.h adlist.h \
+  zmalloc.h

 redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h
 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 zipmap.h staticsymbols.h

 sds.o: sds.c sds.h zmalloc.h
 sds.o: sds.c sds.h zmalloc.h

+zipmap.o: zipmap.c zmalloc.h

 zmalloc.o: zmalloc.c config.h
 
 redis-server: $(OBJ)
 zmalloc.o: zmalloc.c config.h
 
 redis-server: $(OBJ)


@@ -50,15 +60,21 @@ redis-benchmark: $(BENCHOBJ)
 redis-cli: $(CLIOBJ)
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 
 redis-cli: $(CLIOBJ)
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 

+redis-check-dump: $(CHECKDUMPOBJ)
+       $(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
+

 .c.o:
        $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
 
 clean:
 .c.o:
        $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
 
 clean:

-       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o
+       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) *.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
 


@@ -69,4 +85,19 @@ log:
        git log '--pretty=format:%ad %s' --date=short > Changelog
 
 32bit:
        git log '--pretty=format:%ad %s' --date=short > Changelog
 
 32bit:

-       make ARCH="-arch i386"
+       @echo ""
+       @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
+       @echo ""
+       make ARCH="-m32"
+
+gprof:
+       make PROF="-pg"
+
+gcov:
+       make PROF="-fprofile-arcs -ftest-coverage"
+
+noopt:
+       make OPTIMIZATION=""
+
+32bitgprof:
+       make PROF="-pg" ARCH="-arch i386"