redis-benchmark multi bulk reply support hopefully fixed

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 43d273237e50493cced8687c62bb7626e60650c1..9e687d25aea3a4bd30d06843cb73557d8dadb0f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,12 @@
 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
 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
+  CCLINK?= -ldl -lnsl -lsocket -lm

 else
 else

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

 endif
 endif

-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH)
+CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)

 DEBUG?= -g -rdynamic -ggdb 
 
 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o
 DEBUG?= -g -rdynamic -ggdb 
 
 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o


@@ -59,6 +60,9 @@ clean:
 dep:
        $(CC) -MM *.c
 
 dep:
        $(CC) -MM *.c
 

+staticsymbols:
+       tclsh utils/build-static-symbols.tcl > staticsymbols.h
+

 test:
        tclsh test-redis.tcl
 
 test:
        tclsh test-redis.tcl
 


@@ -70,3 +74,9 @@ log:
 
 32bit:
        make ARCH="-arch i386"
 
 32bit:
        make ARCH="-arch i386"

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