From 69ac4d063dc91cf78597b64746a39300bc250b9b Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 12 Apr 2012 11:09:38 +0200 Subject: [PATCH 1/1] Makefile now introduces Redis-specific CFLAGS / LDFLAGS. Gcov target fixed. Added comments to describe how it works. --- src/Makefile | 129 ++++++++++++++++++++++++++------------------------- 1 file changed, 65 insertions(+), 64 deletions(-) diff --git a/src/Makefile b/src/Makefile index a32aa5a3..a0e03f3e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,16 @@ # Redis Makefile # Copyright (C) 2009 Salvatore Sanfilippo # This file is released under the BSD license, see the COPYING file +# +# The Makefile composes the final REDIS_CFLAGS and REDIS_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 ADD_CFLAGS +# and ADD_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') @@ -12,19 +22,19 @@ 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 + 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 - R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) - R_LDFLAGS= $(LDFLAGS) - R_LIBS= $(LIBS) -lm -pthread + 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 -R_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src +REDIS_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src # Default allocator ifeq ($(uname_S),Linux) @@ -47,23 +57,23 @@ ifeq ($(USE_JEMALLOC),yes) endif ifeq ($(MALLOC),tcmalloc) - R_CFLAGS+= -DUSE_TCMALLOC - R_LIBS+= -ltcmalloc + REDIS_CFLAGS+= -DUSE_TCMALLOC + REDIS_LIBS+= -ltcmalloc endif ifeq ($(MALLOC),tcmalloc_minimal) - R_CFLAGS+= -DUSE_TCMALLOC - R_LIBS+= -ltcmalloc_minimal + REDIS_CFLAGS+= -DUSE_TCMALLOC + REDIS_LIBS+= -ltcmalloc_minimal endif ifeq ($(MALLOC),jemalloc) DEPENDENCY_TARGETS+= jemalloc - R_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include - R_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl + REDIS_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include + REDIS_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl endif -R_CC=$(QUIET_CC)$(CC) $(R_CFLAGS) -R_LD=$(QUIET_LINK)$(CC) $(R_LDFLAGS) +REDIS_CC=$(QUIET_CC)$(CC) $(REDIS_CFLAGS) +REDIS_LD=$(QUIET_LINK)$(CC) $(REDIS_LDFLAGS) PREFIX= /usr/local INSTALL_BIN= $(PREFIX)/bin @@ -81,18 +91,18 @@ 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 -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 migrate.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_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_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_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 +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) @echo "" @echo "Hint: To run 'make test' is a good idea ;)" @echo "" @@ -103,7 +113,7 @@ all: $(R_SERVER_NAME) $(R_CLI_NAME) $(R_BENCHMARK_NAME) $(R_CHECK_DUMP_NAME) $(R include Makefile.dep dep: - $(R_CC) -MM *.c > Makefile.dep + $(REDIS_CC) -MM *.c > Makefile.dep .PHONY: dep @@ -111,18 +121,18 @@ dep: .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)) +# 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)) .make-cflags: clean -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS)) - -(echo "$(R_CFLAGS)" > .make-cflags) + -(echo "$(REDIS_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)) +# Clean local objects when REDIS_LDFLAGS is different +ifneq ($(shell sh -c '[ -f .make-ldflags ] && cat .make-ldflags || echo none'), $(REDIS_LDFLAGS)) .make-ldflags: clean - -(echo "$(R_LDFLAGS)" > .make-ldflags) + -(echo "$(REDIS_LDFLAGS)" > .make-ldflags) .make-prerequisites: .make-ldflags endif @@ -134,33 +144,33 @@ ifneq ($(shell sh -c '[ -f .make-malloc ] && cat .make-malloc || echo none'), $( endif # redis-server -$(R_SERVER_NAME): $(R_SERVER_OBJ) - $(R_LD) -o $@ $^ ../deps/lua/src/liblua.a $(R_LIBS) +$(REDIS_SERVEREDIS_NAME): $(REDIS_SERVEREDIS_OBJ) + $(REDIS_LD) -o $@ $^ ../deps/lua/src/liblua.a $(REDIS_LIBS) # 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 $(REDIS_LIBS) # 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 $(REDIS_LIBS) # 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 $@ $^ $(REDIS_LIBS) # 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 $@ $^ $(REDIS_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 - $(R_CC) -c $< + $(REDIS_CC) -c $< 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_SERVEREDIS_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 @@ -170,7 +180,7 @@ distclean: clean .PHONY: distclean -test: $(R_SERVER_NAME) $(R_CHECK_AOF_NAME) +test: $(REDIS_SERVEREDIS_NAME) $(REDIS_CHECK_AOF_NAME) @(cd ..; ./runtest) lcov: @@ -181,11 +191,8 @@ lcov: .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 "" @@ -193,25 +200,19 @@ log: @echo "" $(MAKE) CFLAGS="$(CFLAGS) -m32" LDFLAGS="$(LDFLAGS) -m32" -gprof: - $(MAKE) CFLAGS="$(CFLAGS) -pg" LDFLAGS="$(LDFLAGS) -pg" - gcov: - $(MAKE) CFLAGS="$(CFLAGS) -fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" + $(MAKE) ADD_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" 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) - $(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) + $(INSTALL) $(REDIS_SERVEREDIS_NAME) $(INSTALL_BIN) + $(INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN) + $(INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN) + $(INSTALL) $(REDIS_CHECK_DUMP_NAME) $(INSTALL_BIN) + $(INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN) -- 2.47.2