fixed a minor memory leak in configuration file parsing

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 5caf21b8ec6394442b2546b9f2e9776e545babb8..f3aff26263e5a23cae649146b9e526e985f6bc74 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,12 @@
 # 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
+  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6

   CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
 else
   CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
 else

-  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W $(ARCH) $(PROF)
+  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)

   CCLINK?= -lm -pthread
 endif
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
   CCLINK?= -lm -pthread
 endif
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)


@@ -83,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"