First set defaults, then do composition

[redis.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index a0e03f3e7b2ee3b72f298ba14acc4a3d5d52a238..8b24fd9ccd2949d17eaaec707fe531814ca93f75 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,12 +2,12 @@
 # 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
 #

-# The Makefile composes the final REDIS_CFLAGS and REDIS_LDFLAGS using
+# 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
 # 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 ADD_CFLAGS
-# and ADD_LDFLAGS are used instead (this is the case of 'make gcov').
+# 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.
 #
 # Dependencies are stored in the Makefile.dep file. To rebuild this file
 # Just use 'make dep', but this is only needed by developers.


@@ -17,30 +17,16 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 OPTIMIZATION?=-O2
 DEPENDENCY_TARGETS=hiredis linenoise lua
 
 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)
-  REDIS_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(ADD_CFLAGS) -D__EXTENSIONS__ -D_XPG6
-  REDIS_LDFLAGS= $(LDFLAGS) $(ADD_LDFLAGS)
-  REDIS_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread
-  DEBUG= -g -ggdb
-else
-  REDIS_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(ADD_CFLAGS)
-  REDIS_LDFLAGS= $(LDFLAGS) $(ADD_LDFLAGS)
-  REDIS_LIBS= $(LIBS) -lm -pthread
-  DEBUG= -g -rdynamic -ggdb
-endif
-
-# Include paths to dependencies
-REDIS_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


@@ -56,24 +42,39 @@ ifeq ($(USE_JEMALLOC),yes)
   MALLOC=jemalloc
 endif
 
   MALLOC=jemalloc
 endif
 

+ifeq ($(uname_S),SunOS)
+  FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6
+  FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS)
+  FINAL_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread
+  DEBUG= -g -ggdb
+else
+  FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+  FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS)
+  FINAL_LIBS= $(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)

-  REDIS_CFLAGS+= -DUSE_TCMALLOC
-  REDIS_LIBS+= -ltcmalloc
+  FINAL_CFLAGS+= -DUSE_TCMALLOC
+  FINAL_LIBS+= -ltcmalloc

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

-  REDIS_CFLAGS+= -DUSE_TCMALLOC
-  REDIS_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

-  REDIS_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
-  REDIS_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
 

-REDIS_CC=$(QUIET_CC)$(CC) $(REDIS_CFLAGS)
-REDIS_LD=$(QUIET_LINK)$(CC) $(REDIS_LDFLAGS)
+REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)

 
 PREFIX= /usr/local
 INSTALL_BIN= $(PREFIX)/bin
 
 PREFIX= /usr/local
 INSTALL_BIN= $(PREFIX)/bin


@@ -91,8 +92,8 @@ QUIET_CC = @printf '    %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR
 QUIET_LINK = @printf '    %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2;
 endif
 
 QUIET_LINK = @printf '    %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2;
 endif
 

-REDIS_SERVEREDIS_NAME= redis-server
-REDIS_SERVEREDIS_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 migrate.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o
+REDIS_SERVER_NAME= redis-server
+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 migrate.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o

 REDIS_CLI_NAME= redis-cli
 REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o
 REDIS_BENCHMARK_NAME= redis-benchmark
 REDIS_CLI_NAME= redis-cli
 REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o
 REDIS_BENCHMARK_NAME= redis-benchmark


@@ -102,7 +103,7 @@ REDIS_CHECK_DUMP_OBJ= redis-check-dump.o lzf_c.o lzf_d.o
 REDIS_CHECK_AOF_NAME= redis-check-aof
 REDIS_CHECK_AOF_OBJ= redis-check-aof.o
 
 REDIS_CHECK_AOF_NAME= redis-check-aof
 REDIS_CHECK_AOF_OBJ= redis-check-aof.o
 

-all: $(REDIS_SERVEREDIS_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_DUMP_NAME) $(REDIS_CHECK_AOF_NAME)
+all: $(REDIS_SERVER_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 ""


@@ -121,18 +122,18 @@ dep:
 .make-prerequisites:
        @touch $@
 
 .make-prerequisites:
        @touch $@
 

-# Clean local objects and build dependencies when REDIS_CFLAGS is different
-ifneq ($(shell sh -c '[ -f .make-cflags ] && cat .make-cflags || echo none'), $(REDIS_CFLAGS))
+# Clean local objects and build dependencies when FINAL_CFLAGS is different
+ifneq ($(shell sh -c '[ -f .make-cflags ] && cat .make-cflags || echo none'), $(FINAL_CFLAGS))

 .make-cflags: clean
        -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
 .make-cflags: clean
        -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))

-       -(echo "$(REDIS_CFLAGS)" > .make-cflags)
+       -(echo "$(FINAL_CFLAGS)" > .make-cflags)

 .make-prerequisites: .make-cflags
 endif
 
 .make-prerequisites: .make-cflags
 endif
 

-# Clean local objects when REDIS_LDFLAGS is different
-ifneq ($(shell sh -c '[ -f .make-ldflags ] && cat .make-ldflags || echo none'), $(REDIS_LDFLAGS))
+# Clean local objects when FINAL_LDFLAGS is different
+ifneq ($(shell sh -c '[ -f .make-ldflags ] && cat .make-ldflags || echo none'), $(FINAL_LDFLAGS))

 .make-ldflags: clean
 .make-ldflags: clean

-       -(echo "$(REDIS_LDFLAGS)" > .make-ldflags)
+       -(echo "$(FINAL_LDFLAGS)" > .make-ldflags)

 .make-prerequisites: .make-ldflags
 endif
 
 .make-prerequisites: .make-ldflags
 endif
 


@@ -144,24 +145,24 @@ ifneq ($(shell sh -c '[ -f .make-malloc ] && cat .make-malloc || echo none'), $(
 endif
 
 # redis-server
 endif
 
 # redis-server

-$(REDIS_SERVEREDIS_NAME): $(REDIS_SERVEREDIS_OBJ)
-       $(REDIS_LD) -o $@ $^ ../deps/lua/src/liblua.a $(REDIS_LIBS)
+$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
+       $(REDIS_LD) -o $@ $^ ../deps/lua/src/liblua.a $(FINAL_LIBS)

 
 # redis-cli
 $(REDIS_CLI_NAME): $(REDIS_CLI_OBJ)
 
 # redis-cli
 $(REDIS_CLI_NAME): $(REDIS_CLI_OBJ)

-       $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(REDIS_LIBS)
+       $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS)

 
 # redis-benchmark
 $(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)
 
 # redis-benchmark
 $(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)

-       $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_LIBS)
+       $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)

 
 # redis-check-dump
 $(REDIS_CHECK_DUMP_NAME): $(REDIS_CHECK_DUMP_OBJ)
 
 # redis-check-dump
 $(REDIS_CHECK_DUMP_NAME): $(REDIS_CHECK_DUMP_OBJ)

-       $(REDIS_LD) -o $@ $^ $(REDIS_LIBS)
+       $(REDIS_LD) -o $@ $^ $(FINAL_LIBS)

 
 # redis-check-aof
 $(REDIS_CHECK_AOF_NAME): $(REDIS_CHECK_AOF_OBJ)
 
 # redis-check-aof
 $(REDIS_CHECK_AOF_NAME): $(REDIS_CHECK_AOF_OBJ)

-       $(REDIS_LD) -o $@ $^ $(REDIS_LIBS)
+       $(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
 
 # 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


@@ -170,7 +171,7 @@ $(REDIS_CHECK_AOF_NAME): $(REDIS_CHECK_AOF_OBJ)
        $(REDIS_CC) -c $<
 
 clean:
        $(REDIS_CC) -c $<
 
 clean:

-       rm -rf $(REDIS_SERVEREDIS_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_DUMP_NAME) $(REDIS_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov redis.info lcov-html
+       rm -rf $(REDIS_SERVER_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
 


@@ -180,11 +181,11 @@ distclean: clean
 
 .PHONY: distclean
 
 
 .PHONY: distclean
 

-test: $(REDIS_SERVEREDIS_NAME) $(REDIS_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
        @(set -e; cd ..; ./runtest --clients 1)
        @geninfo -o redis.info .
        @genhtml --legend -o lcov-html redis.info


@@ -201,7 +202,7 @@ bench: $(REDIS_BENCHMARK_NAME)
        $(MAKE) CFLAGS="$(CFLAGS) -m32" LDFLAGS="$(LDFLAGS) -m32"
 
 gcov:
        $(MAKE) CFLAGS="$(CFLAGS) -m32" LDFLAGS="$(LDFLAGS) -m32"
 
 gcov:

-       $(MAKE) ADD_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"


@@ -211,7 +212,7 @@ src/help.h:
 
 install: all
        mkdir -p $(INSTALL_BIN)
 
 install: all
        mkdir -p $(INSTALL_BIN)

-       $(INSTALL) $(REDIS_SERVEREDIS_NAME) $(INSTALL_BIN)
+       $(INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN)

        $(INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
        $(INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)
        $(INSTALL) $(REDIS_CHECK_DUMP_NAME) $(INSTALL_BIN)
        $(INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
        $(INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)
        $(INSTALL) $(REDIS_CHECK_DUMP_NAME) $(INSTALL_BIN)