You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.7 KiB
46 lines
1.7 KiB
Index: Makefile |
|
--- Makefile.orig 2010-05-21 14:51:53.000000000 +0200 |
|
+++ Makefile 2010-05-22 09:51:16.000000000 +0200 |
|
@@ -6,14 +6,14 @@ |
|
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
|
OPTIMIZATION?=-O2 |
|
ifeq ($(uname_S),SunOS) |
|
- CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6 |
|
- CCLINK?= -ldl -lnsl -lsocket -lm -lpthread |
|
+ CFLAGS?= -std=c99 $(OPTIMIZATION) -D__EXTENSIONS__ -D_XPG6 |
|
+ LIBS?= -ldl -lnsl -lsocket -lm -lpthread |
|
else |
|
- CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) |
|
- CCLINK?= -lm -pthread |
|
+ CFLAGS?= -std=c99 $(OPTIMIZATION) $(ARCH) $(PROF) |
|
+ LIBS?= -lm -pthread |
|
endif |
|
-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) |
|
-DEBUG?= -g -rdynamic -ggdb |
|
+CCOPT= $(CFLAGS) $(ARCH) $(PROF) |
|
+DEBUG?= |
|
|
|
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 |
|
BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o |
|
@@ -56,7 +56,7 @@ |
|
zmalloc.o: zmalloc.c config.h |
|
|
|
redis-server: $(OBJ) |
|
- $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) |
|
+ $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(LIBS) |
|
@echo "" |
|
@echo "Hint: To run the test-redis.tcl script is a good idea." |
|
@echo "Launch the redis server with ./redis-server, then in another" |
|
@@ -64,10 +64,10 @@ |
|
@echo "" |
|
|
|
redis-benchmark: $(BENCHOBJ) |
|
- $(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) |
|
+ $(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) $(LIBS) |
|
|
|
redis-cli: $(CLIOBJ) |
|
- $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) |
|
+ $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) $(LIBS) |
|
|
|
redis-check-dump: $(CHECKDUMPOBJ) |
|
$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
|
|
|