X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/92f8e882046e8e129236ac751d9a4fdf254b022f..2e111efe5a8d5092a4a6d391096ff6712cf6f162:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 50b32887..f3aff262 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,13 @@
 # This file is released under the BSD license, see the COPYING file
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+OPTIMIZATION?=-O2
 ifeq ($(uname_S),SunOS)
-  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -D__EXTENSIONS__ -D_XPG6
-  CCLINK?= -ldl -lnsl -lsocket -lm
-  PTLINK?= -lpthread
+  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
+  CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
 else
-  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W $(ARCH) $(PROF)
-  CCLINK?= -lm
-  PTLINK?= -lpthread
+  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
+  CCLINK?= -lm -pthread
 endif
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
 DEBUG?= -g -rdynamic -ggdb 
@@ -42,7 +41,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"
@@ -85,5 +84,8 @@ gprof:
 gcov:
 	make PROF="-fprofile-arcs -ftest-coverage"
 
+noopt:
+	make OPTIMIZATION=""
+
 32bitgprof:
 	make PROF="-pg" ARCH="-arch i386"