summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2010-01-11 05:15:54 -0500
committerantirez <antirez@gmail.com>2010-01-11 05:15:54 -0500
commita69a0c9c3bc199a627a794e07f3449290ddb0dc8 (patch)
treed7219a96ba740f5c63a87d177a56a2709be5411c /Makefile
parent996cb5f704b2b37e764d63d0889463fd8ef2b70e (diff)
downloadredis-a69a0c9c3bc199a627a794e07f3449290ddb0dc8.tar.gz
More threaded I/O VM work + Redis init script
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 50b328874..5caf21b8e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,10 @@
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
- PTLINK?= -lpthread
+ CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
else
CFLAGS?= -std=c99 -pedantic -O2 -Wall -W $(ARCH) $(PROF)
- CCLINK?= -lm
- PTLINK?= -lpthread
+ CCLINK?= -lm -pthread
endif
CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
DEBUG?= -g -rdynamic -ggdb
@@ -42,7 +40,7 @@ sds.o: sds.c sds.h zmalloc.h
zmalloc.o: zmalloc.c config.h
redis-server: $(OBJ)
- $(CC) -o $(PRGNAME) $(CCOPT) $(PTLINK) $(DEBUG) $(OBJ)
+ $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
@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"