Lines 15-21
Link Here
|
15 |
release_hdr := $(shell sh -c './mkreleasehdr.sh') |
15 |
release_hdr := $(shell sh -c './mkreleasehdr.sh') |
16 |
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
16 |
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
17 |
OPTIMIZATION?=-O2 |
17 |
OPTIMIZATION?=-O2 |
18 |
DEPENDENCY_TARGETS=hiredis linenoise lua |
18 |
DEPENDENCY_TARGETS=linenoise lua |
19 |
# Default settings |
19 |
# Default settings |
20 |
STD=-std=c99 -pedantic |
20 |
STD=-std=c99 -pedantic |
Lines 51-57
endif
Link Here
|
51 |
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) |
51 |
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) |
52 |
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) |
52 |
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) |
53 |
FINAL_LIBS=-lm |
53 |
FINAL_LIBS=-lm -lhiredis |
54 |
DEBUG=-g -ggdb |
54 |
DEBUG=-g -ggdb |
55 |
ifeq ($(uname_S),SunOS) |
55 |
ifeq ($(uname_S),SunOS) |
Lines 70-76
endif
Link Here
|
70 |
endif |
70 |
endif |
71 |
# Include paths to dependencies |
71 |
# Include paths to dependencies |
72 |
FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src |
72 |
FINAL_CFLAGS+= -I/usr/include/hiredis -I../deps/linenoise -I../deps/lua/src |
73 |
ifeq ($(MALLOC),tcmalloc) |
73 |
ifeq ($(MALLOC),tcmalloc) |
74 |
FINAL_CFLAGS+= -DUSE_TCMALLOC |
74 |
FINAL_CFLAGS+= -DUSE_TCMALLOC |
Lines 162-168
endif
Link Here
|
162 |
# redis-server |
162 |
# redis-server |
163 |
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) |
163 |
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) |
164 |
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) |
164 |
$(REDIS_LD) -o $@ $^ ../deps/lua/src/liblua.a $(FINAL_LIBS) |
165 |
# redis-sentinel |
165 |
# redis-sentinel |
166 |
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) |
166 |
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) |
Lines 170-180
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
Link Here
|
170 |
# redis-cli |
170 |
# redis-cli |
171 |
$(REDIS_CLI_NAME): $(REDIS_CLI_OBJ) |
171 |
$(REDIS_CLI_NAME): $(REDIS_CLI_OBJ) |
172 |
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS) |
172 |
$(REDIS_LD) -o $@ $^ ../deps/linenoise/linenoise.o $(FINAL_LIBS) |
173 |
# redis-benchmark |
173 |
# redis-benchmark |
174 |
$(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ) |
174 |
$(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ) |
175 |
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) |
175 |
$(REDIS_LD) -o $@ $^ $(FINAL_LIBS) |
176 |
# redis-check-dump |
176 |
# redis-check-dump |
177 |
$(REDIS_CHECK_DUMP_NAME): $(REDIS_CHECK_DUMP_OBJ) |
177 |
$(REDIS_CHECK_DUMP_NAME): $(REDIS_CHECK_DUMP_OBJ) |