Use writev(2) if glue output buffers is disabled

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index fdffde82c18f806cb83949e03fb9559e9c2cdc7f..9e687d25aea3a4bd30d06843cb73557d8dadb0f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,16 @@
 # Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
 # This file is released under the BSD license, see the COPYING file
 
 # Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
 # This file is released under the BSD license, see the COPYING file
 

+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
+else
+  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W $(ARCH) $(PROF)
+  CCLINK?= -lm
+endif
+CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)

 DEBUG?= -g -rdynamic -ggdb 
 DEBUG?= -g -rdynamic -ggdb 

-CFLAGS?= -std=c99 -O2 -pedantic -Wall -W
-CCOPT= $(CFLAGS)

 
 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o
 BENCHOBJ = ae.o anet.o benchmark.o sds.o adlist.o zmalloc.o
 
 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o
 BENCHOBJ = ae.o anet.o benchmark.o sds.o adlist.o zmalloc.o


@@ -45,7 +52,7 @@ redis-cli: $(CLIOBJ)
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 
 .c.o:
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 
 .c.o:

-       $(CC) -c $(CCOPT) $(DEBUG) $(COMPILE_TIME) $<
+       $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<

 
 clean:
        rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o
 
 clean:
        rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o


@@ -53,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
 


@@ -61,3 +71,12 @@ bench:
 
 log:
        git log '--pretty=format:%ad %s' --date=short > Changelog
 
 log:
        git log '--pretty=format:%ad %s' --date=short > Changelog

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