Fixed a never experienced, theoretical bug that can actually happen in practice....

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 50b328874dd69024f006365bbbace244d4d2fe30..f3aff26263e5a23cae649146b9e526e985f6bc74 100644 (file)
--- 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')
 # 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)
 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
 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 
 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)
 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"
        @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"
 
 gcov:
        make PROF="-fprofile-arcs -ftest-coverage"
 

+noopt:
+       make OPTIMIZATION=""
+

 32bitgprof:
        make PROF="-pg" ARCH="-arch i386"
 32bitgprof:
        make PROF="-pg" ARCH="-arch i386"