Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 533000 | Differences between
and this patch

Collapse All | Expand All

(-)src/Makefile (-2 / +4 lines)
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=hiredis linenoise
19
# Default settings
19
# Default settings
20
STD=-std=c99 -pedantic
20
STD=-std=c99 -pedantic
Lines 52-57 endif Link Here
52
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
52
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
53
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
53
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
54
FINAL_LIBS=-lm
54
FINAL_LIBS=-lm
55
FINAL_LIBS+=$(shell pkg-config --libs lua)
55
DEBUG=-g -ggdb
56
DEBUG=-g -ggdb
56
ifeq ($(uname_S),SunOS)
57
ifeq ($(uname_S),SunOS)
Lines 108-113 endif Link Here
108
REDIS_SERVER_NAME=redis-server
109
REDIS_SERVER_NAME=redis-server
109
REDIS_SENTINEL_NAME=redis-sentinel
110
REDIS_SENTINEL_NAME=redis-sentinel
110
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 endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o hyperloglog.o latency.o sparkline.o
111
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 endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o hyperloglog.o latency.o sparkline.o
112
REDIS_SERVER_OBJ+=lua_cjson.o lua_cmsgpack.o lua_struct.o lua_bit.o strbuf.o fpconv.o
111
REDIS_CLI_NAME=redis-cli
113
REDIS_CLI_NAME=redis-cli
112
REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
114
REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
113
REDIS_BENCHMARK_NAME=redis-benchmark
115
REDIS_BENCHMARK_NAME=redis-benchmark
Lines 162-168 endif Link Here
162
# redis-server
164
# redis-server
163
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
165
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
164
	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
166
	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
165
# redis-sentinel
167
# redis-sentinel
166
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
168
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)

Return to bug 533000