Fix MULTI / EXEC rendering in MONITOR output.

[redis.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 656300d32cf2bbe6aec4af3912623720de4b48e4..358b4cbac6cba59ad9baed4d78135b81f1794f63 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,36 +1,32 @@
 # Redis Makefile
 # Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
 # This file is released under the BSD license, see the COPYING file
 # Redis Makefile
 # Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
 # This file is released under the BSD license, see the COPYING file

+#
+# The Makefile composes the final FINAL_CFLAGS and FINAL_LDFLAGS using
+# what is needed for Redis plus the standard CFLAGS and LDFLAGS passed.
+# However when building the dependencies (Jemalloc, Lua, Hiredis, ...)
+# CFLAGS and LDFLAGS are propagated to the dependencies, so to pass
+# flags only to be used when compiling / linking Redis itself REDIS_CFLAGS
+# and REDIS_LDFLAGS are used instead (this is the case of 'make gcov').
+#
+# Dependencies are stored in the Makefile.dep file. To rebuild this file
+# Just use 'make dep', but this is only needed by developers.

 
 release_hdr := $(shell sh -c './mkreleasehdr.sh')
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 OPTIMIZATION?=-O2
 DEPENDENCY_TARGETS=hiredis linenoise lua
 
 
 release_hdr := $(shell sh -c './mkreleasehdr.sh')
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 OPTIMIZATION?=-O2
 DEPENDENCY_TARGETS=hiredis linenoise lua
 

+# Default settings

 STD= -std=c99 -pedantic
 WARN= -Wall
 OPT= $(OPTIMIZATION)
 
 STD= -std=c99 -pedantic
 WARN= -Wall
 OPT= $(OPTIMIZATION)
 

-ifeq ($(uname_S),SunOS)
-  R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -D__EXTENSIONS__ -D_XPG6
-  R_LDFLAGS= $(LDFLAGS)
-  R_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread
-  DEBUG= -g -ggdb
-else
-  R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-  R_LDFLAGS= $(LDFLAGS)
-  R_LIBS= $(LIBS) -lm -pthread
-  DEBUG= -g -rdynamic -ggdb
-endif
-
-# Include paths to dependencies
-R_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-

 # Default allocator
 ifeq ($(uname_S),Linux)
 # Default allocator
 ifeq ($(uname_S),Linux)

-  MALLOC?=jemalloc
+  MALLOC=jemalloc

 else
 else

-  MALLOC?=libc
+  MALLOC=libc

 endif
 
 # Backwards compatibility for selecting an allocator
 endif
 
 # Backwards compatibility for selecting an allocator


@@ -46,26 +42,45 @@ ifeq ($(USE_JEMALLOC),yes)
   MALLOC=jemalloc
 endif
 
   MALLOC=jemalloc
 endif
 

+# Override default settings if possible
+-include .make-settings
+
+ifeq ($(uname_S),SunOS)
+  FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6
+  FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -ggdb
+  FINAL_LIBS= -ldl -lnsl -lsocket -lm -lpthread
+  DEBUG= -g -ggdb
+else
+  FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+  FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb
+  FINAL_LIBS= -lm -pthread
+  DEBUG= -g -rdynamic -ggdb
+endif
+
+# Include paths to dependencies
+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
+

 ifeq ($(MALLOC),tcmalloc)
 ifeq ($(MALLOC),tcmalloc)

-  R_CFLAGS+= -DUSE_TCMALLOC
-  R_LIBS+= -ltcmalloc
+  FINAL_CFLAGS+= -DUSE_TCMALLOC
+  FINAL_LIBS+= -ltcmalloc

 endif
 
 ifeq ($(MALLOC),tcmalloc_minimal)
 endif
 
 ifeq ($(MALLOC),tcmalloc_minimal)

-  R_CFLAGS+= -DUSE_TCMALLOC
-  R_LIBS+= -ltcmalloc_minimal
+  FINAL_CFLAGS+= -DUSE_TCMALLOC
+  FINAL_LIBS+= -ltcmalloc_minimal

 endif
 
 ifeq ($(MALLOC),jemalloc)
   DEPENDENCY_TARGETS+= jemalloc
 endif
 
 ifeq ($(MALLOC),jemalloc)
   DEPENDENCY_TARGETS+= jemalloc

-  R_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
-  R_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
+  FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+  FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl

 endif
 
 endif
 

-R_CC=$(QUIET_CC)$(CC) $(R_CFLAGS)
-R_LD=$(QUIET_LINK)$(CC) $(R_LDFLAGS)
+REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
+REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)

 
 

-PREFIX= /usr/local
+PREFIX?=/usr/local

 INSTALL_BIN= $(PREFIX)/bin
 INSTALL= cp -pf
 
 INSTALL_BIN= $(PREFIX)/bin
 INSTALL= cp -pf
 


@@ -79,20 +94,22 @@ ENDCOLOR="\033[0m"
 ifndef V
 QUIET_CC = @printf '    %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR) 1>&2;
 QUIET_LINK = @printf '    %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2;
 ifndef V
 QUIET_CC = @printf '    %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR) 1>&2;
 QUIET_LINK = @printf '    %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2;

+QUIET_INSTALL = @printf '    %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2;

 endif
 
 endif
 

-R_SERVER_NAME= redis-server
-R_SERVER_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 sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o
-R_CLI_NAME= redis-cli
-R_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o
-R_BENCHMARK_NAME= redis-benchmark
-R_BENCHMARK_OBJ= ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o redis-benchmark.o
-R_CHECK_DUMP_NAME= redis-check-dump
-R_CHECK_DUMP_OBJ= redis-check-dump.o lzf_c.o lzf_d.o
-R_CHECK_AOF_NAME= redis-check-aof
-R_CHECK_AOF_OBJ= redis-check-aof.o
-
-all: $(R_SERVER_NAME) $(R_CLI_NAME) $(R_BENCHMARK_NAME) $(R_CHECK_DUMP_NAME) $(R_CHECK_AOF_NAME)
+REDIS_SERVER_NAME= redis-server
+REDIS_SENTINEL_NAME= redis-sentinel
+REDIS_SERVER_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 sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o
+REDIS_CLI_NAME= redis-cli
+REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o
+REDIS_BENCHMARK_NAME= redis-benchmark
+REDIS_BENCHMARK_OBJ= ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o redis-benchmark.o
+REDIS_CHECK_DUMP_NAME= redis-check-dump
+REDIS_CHECK_DUMP_OBJ= redis-check-dump.o lzf_c.o lzf_d.o crc64.o
+REDIS_CHECK_AOF_NAME= redis-check-aof
+REDIS_CHECK_AOF_OBJ= redis-check-aof.o
+
+all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_DUMP_NAME) $(REDIS_CHECK_AOF_NAME)

        @echo ""
        @echo "Hint: To run 'make test' is a good idea ;)"
        @echo ""
        @echo ""
        @echo "Hint: To run 'make test' is a good idea ;)"
        @echo ""


@@ -103,64 +120,70 @@ all: $(R_SERVER_NAME) $(R_CLI_NAME) $(R_BENCHMARK_NAME) $(R_CHECK_DUMP_NAME) $(R
 include Makefile.dep
 
 dep:
 include Makefile.dep
 
 dep:

-       $(R_CC) -MM *.c > Makefile.dep
+       $(REDIS_CC) -MM *.c > Makefile.dep

 
 .PHONY: dep
 
 
 .PHONY: dep
 

+persist-settings: distclean
+       echo STD=$(STD) >> .make-settings
+       echo WARN=$(WARN) >> .make-settings
+       echo OPT=$(OPT) >> .make-settings
+       echo MALLOC=$(MALLOC) >> .make-settings
+       echo CFLAGS=$(CFLAGS) >> .make-settings
+       echo LDFLAGS=$(LDFLAGS) >> .make-settings
+       echo REDIS_CFLAGS=$(REDIS_CFLAGS) >> .make-settings
+       echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings
+       echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
+       echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
+       -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
+
+.PHONY: persist-settings
+

 # Prerequisites target
 .make-prerequisites:
        @touch $@
 
 # Prerequisites target
 .make-prerequisites:
        @touch $@
 

-# Clean local objects and build dependencies when R_CFLAGS is different
-ifneq ($(shell sh -c '[ -f .make-cflags ] && cat .make-cflags || echo none'), $(R_CFLAGS))
-.make-cflags: clean
-       -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
-       -(echo "$(R_CFLAGS)" > .make-cflags)
-.make-prerequisites: .make-cflags
-endif
-
-# Clean local objects when R_LDFLAGS is different
-ifneq ($(shell sh -c '[ -f .make-ldflags ] && cat .make-ldflags || echo none'), $(R_LDFLAGS))
-.make-ldflags: clean
-       -(echo "$(R_LDFLAGS)" > .make-ldflags)
-.make-prerequisites: .make-ldflags
+# Clean everything, persist settings and build dependencies if anything changed
+ifneq ($(strip $(PREV_FINAL_CFLAGS)), $(strip $(FINAL_CFLAGS)))
+.make-prerequisites: persist-settings

 endif
 
 endif
 

-# Clean local objects when MALLOC is different
-ifneq ($(shell sh -c '[ -f .make-malloc ] && cat .make-malloc || echo none'), $(MALLOC))
-.make-malloc: clean
-       -(echo "$(MALLOC)" > .make-malloc)
-.make-prerequisites: .make-malloc
+ifneq ($(strip $(PREV_FINAL_LDFLAGS)), $(strip $(FINAL_LDFLAGS)))
+.make-prerequisites: persist-settings

 endif
 
 # redis-server
 endif
 
 # redis-server

-$(R_SERVER_NAME): $(R_SERVER_OBJ)
-       $(R_LD) -o $@ $^ ../deps/lua/src/liblua.a $(R_LIBS)
+$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
+       $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
+
+# redis-sentinel
+$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
+       $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME)

 
 # redis-cli
 
 # redis-cli

-$(R_CLI_NAME): $(R_CLI_OBJ)
-       $(R_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(R_LIBS)
+$(REDIS_CLI_NAME): $(REDIS_CLI_OBJ)
+       $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS)

 
 # redis-benchmark
 
 # redis-benchmark

-$(R_BENCHMARK_NAME): $(R_BENCHMARK_OBJ)
-       $(R_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(R_LIBS)
+$(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)
+       $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)

 
 # redis-check-dump
 
 # redis-check-dump

-$(R_CHECK_DUMP_NAME): $(R_CHECK_DUMP_OBJ)
-       $(R_LD) -o $@ $^ $(R_LIBS)
+$(REDIS_CHECK_DUMP_NAME): $(REDIS_CHECK_DUMP_OBJ)
+       $(REDIS_LD) -o $@ $^ $(FINAL_LIBS)

 
 # redis-check-aof
 
 # redis-check-aof

-$(R_CHECK_AOF_NAME): $(R_CHECK_AOF_OBJ)
-       $(R_LD) -o $@ $^ $(R_LIBS)
+$(REDIS_CHECK_AOF_NAME): $(REDIS_CHECK_AOF_OBJ)
+       $(REDIS_LD) -o $@ $^ $(FINAL_LIBS)

 
 # Because the jemalloc.h header is generated as a part of the jemalloc build,
 # building it should complete before building any other object. Instead of
 # depending on a single artifact, build all dependencies first.
 %.o: %.c .make-prerequisites
 
 # Because the jemalloc.h header is generated as a part of the jemalloc build,
 # building it should complete before building any other object. Instead of
 # depending on a single artifact, build all dependencies first.
 %.o: %.c .make-prerequisites

-       $(R_CC) -c $<
+       $(REDIS_CC) -c $<

 
 clean:
 
 clean:

-       rm -rf $(R_SERVER_NAME) $(R_CLI_NAME) $(R_BENCHMARK_NAME) $(R_CHECK_DUMP_NAME) $(R_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov redis.info lcov-html
+       rm -rf $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_DUMP_NAME) $(REDIS_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov redis.info lcov-html

 
 .PHONY: clean
 
 
 .PHONY: clean
 


@@ -170,48 +193,39 @@ distclean: clean
 
 .PHONY: distclean
 
 
 .PHONY: distclean
 

-test: $(R_SERVER_NAME) $(R_CHECK_AOF_NAME)
+test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)

        @(cd ..; ./runtest)
 
 lcov:
        @(cd ..; ./runtest)
 
 lcov:

-       $(MAKE) clean gcov
+       $(MAKE) gcov

        @(set -e; cd ..; ./runtest --clients 1)
        @geninfo -o redis.info .
        @genhtml --legend -o lcov-html redis.info
 
 .PHONY: lcov
 
        @(set -e; cd ..; ./runtest --clients 1)
        @geninfo -o redis.info .
        @genhtml --legend -o lcov-html redis.info
 
 .PHONY: lcov
 

-bench: $(R_BENCHMARK_NAME)
-       ./$(R_BENCHMARK_NAME)
-
-log:
-       git log '--pretty=format:%ad %s (%cn)' --date=short > ../Changelog
+bench: $(REDIS_BENCHMARK_NAME)
+       ./$(REDIS_BENCHMARK_NAME)

 
 32bit:
        @echo ""
        @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
        @echo ""
 
 32bit:
        @echo ""
        @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
        @echo ""

-       $(MAKE) CFLAGS="$(CFLAGS) -m32" LDFLAGS="$(LDFLAGS) -m32"
-
-gprof:
-       $(MAKE) CFLAGS="$(CFLAGS) -pg" LDFLAGS="$(LDFLAGS) -pg"
+       $(MAKE) CFLAGS="-m32" LDFLAGS="-m32"

 
 gcov:
 
 gcov:

-       $(MAKE) CFLAGS="$(CFLAGS) -fprofile-arcs -ftest-coverage -DCOVERAGE_TEST"
+       $(MAKE) REDIS_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" REDIS_LDFLAGS="-fprofile-arcs -ftest-coverage"

 
 noopt:
        $(MAKE) OPT="-O0"
 
 
 noopt:
        $(MAKE) OPT="-O0"
 

-32bitgprof:
-       $(MAKE) CFLAGS="$(CFLAGS) -m32" LDFLAGS="$(LDFLAGS) -m32" gprof
-

 src/help.h:
        @../utils/generate-command-help.rb > help.h
 
 install: all
        mkdir -p $(INSTALL_BIN)
 src/help.h:
        @../utils/generate-command-help.rb > help.h
 
 install: all
        mkdir -p $(INSTALL_BIN)

-       $(INSTALL) $(R_SERVER_NAME) $(INSTALL_BIN)
-       $(INSTALL) $(R_BENCHMARK_NAME) $(INSTALL_BIN)
-       $(INSTALL) $(R_CLI_NAME) $(INSTALL_BIN)
-       $(INSTALL) $(R_CHECK_DUMP_NAME) $(INSTALL_BIN)
-       $(INSTALL) $(R_CHECK_AOF_NAME) $(INSTALL_BIN)
+       $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN)
+       $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
+       $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)
+       $(REDIS_INSTALL) $(REDIS_CHECK_DUMP_NAME) $(INSTALL_BIN)
+       $(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN)