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.5 KiB
46 lines
1.5 KiB
Index: Makefile |
|
--- Makefile.orig 2010-03-02 13:56:03.000000000 +0100 |
|
+++ Makefile 2010-03-18 08:57:01.000000000 +0100 |
|
@@ -4,14 +4,14 @@ |
|
|
|
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
|
ifeq ($(uname_S),SunOS) |
|
- CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -D__EXTENSIONS__ -D_XPG6 |
|
- CCLINK?= -ldl -lnsl -lsocket -lm |
|
+ CFLAGS?= -std=c99 -D__EXTENSIONS__ -D_XPG6 |
|
+ LIBS?= -ldl -lnsl -lsocket -lm |
|
else |
|
- CFLAGS?= -std=c99 -pedantic -O2 -Wall -W $(ARCH) $(PROF) |
|
- CCLINK?= -lm |
|
+ CFLAGS?= -std=c99 $(ARCH) $(PROF) |
|
+ LIBS?= -lm |
|
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 |
|
BENCHOBJ = ae.o anet.o benchmark.o sds.o adlist.o zmalloc.o |
|
@@ -40,7 +40,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" |
|
@@ -48,10 +48,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) |
|
|
|
.c.o: |
|
$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
|
|
|