Merge branch 'unstable'

[redis.git] / deps / hiredis / Makefile

diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
index 2ae73d4f2b95001e7146a42cca14e3e1ccab23a6..2a84b9b3f7b13154031888b6eb7236402899f367 100644 (file)
--- a/deps/hiredis/Makefile
+++ b/deps/hiredis/Makefile
@@ -6,32 +6,38 @@ OBJ = net.o hiredis.o sds.o async.o
 BINS = hiredis-example hiredis-test
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 BINS = hiredis-example hiredis-test
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')

-OPTIMIZATION?=-O2
+OPTIMIZATION?=-O3

 ifeq ($(uname_S),SunOS)
 ifeq ($(uname_S),SunOS)

-  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -D__EXTENSIONS__ -D_XPG6
-  CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
+  CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -D__EXTENSIONS__ -D_XPG6 $(ARCH) $(PROF)
+  CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
+  LDFLAGS?=-L. -Wl,-R,.

   DYLIBNAME?=libhiredis.so
   DYLIBNAME?=libhiredis.so

-  DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
+  DYLIB_MAKE_CMD?=$(CC) -G -o ${DYLIBNAME} ${OBJ}

   STLIBNAME?=libhiredis.a
   STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
   STLIBNAME?=libhiredis.a
   STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}

-else ifeq ($(uname_S),Darwin)
-  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wwrite-strings $(ARCH) $(PROF)
-  CCLINK?= -lm -pthread
-  OBJARCH?= -arch i386 -arch x86_64
+else
+ifeq ($(uname_S),Darwin)
+  CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
+  CCLINK?=-lm -pthread
+  LDFLAGS?=-L. -Wl,-rpath,.
+  OBJARCH?=-arch i386 -arch x86_64

   DYLIBNAME?=libhiredis.dylib
   DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
   STLIBNAME?=libhiredis.a
   STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ}
 else
   DYLIBNAME?=libhiredis.dylib
   DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
   STLIBNAME?=libhiredis.a
   STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ}
 else

-  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wwrite-strings $(ARCH) $(PROF)
-  CCLINK?= -lm -pthread
+  CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
+  CCLINK?=-lm -pthread
+  LDFLAGS?=-L. -Wl,-rpath,.

   DYLIBNAME?=libhiredis.so
   DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
   STLIBNAME?=libhiredis.a
   STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
 endif
   DYLIBNAME?=libhiredis.so
   DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
   STLIBNAME?=libhiredis.a
   STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
 endif

-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
-DEBUG?= -g -ggdb 
+endif
+
+CCOPT= $(CFLAGS) $(CCLINK)
+DEBUG?= -g -ggdb

 
 PREFIX?= /usr/local
 INSTALL_INC= $(PREFIX)/include/hiredis
 
 PREFIX?= /usr/local
 INSTALL_INC= $(PREFIX)/include/hiredis


@@ -42,9 +48,7 @@ all: ${DYLIBNAME} ${BINS}
 
 # Deps (use make dep to generate this)
 net.o: net.c fmacros.h net.h
 
 # Deps (use make dep to generate this)
 net.o: net.c fmacros.h net.h

-async.o: async.c async.h hiredis.h sds.h util.h
-example-libev.o: example-libev.c hiredis.h async.h adapters/libev.h
-example-libevent.o: example-libevent.c hiredis.h async.h adapters/libevent.h
+async.o: async.c async.h hiredis.h sds.h util.h dict.c dict.h

 example.o: example.c hiredis.h
 hiredis.o: hiredis.c hiredis.h net.h sds.h util.h
 sds.o: sds.c sds.h
 example.o: example.c hiredis.h
 hiredis.o: hiredis.c hiredis.h net.h sds.h util.h
 sds.o: sds.c sds.h


@@ -60,14 +64,23 @@ dynamic: ${DYLIBNAME}
 static: ${STLIBNAME}
 
 # Binaries:
 static: ${STLIBNAME}
 
 # Binaries:

-hiredis-example-libevent: example-libevent.o ${DYLIBNAME}
-       $(CC) -o $@ $(CCOPT) $(DEBUG) -L. -lhiredis -levent -Wl,-rpath,. example-libevent.c
+hiredis-example-libevent: example-libevent.c adapters/libevent.h ${DYLIBNAME}
+       $(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) -lhiredis -levent example-libevent.c

 
 

-hiredis-example-libev: example-libev.o ${DYLIBNAME}
-       $(CC) -o $@ $(CCOPT) $(DEBUG) -L. -lhiredis -lev -Wl,-rpath,. example-libev.c
+hiredis-example-libev: example-libev.c adapters/libev.h ${DYLIBNAME}
+       $(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) -lhiredis -lev example-libev.c
+
+ifndef AE_DIR
+hiredis-example-ae:
+       @echo "Please specify AE_DIR (e.g. <redis repository>/src)"
+       @false
+else
+hiredis-example-ae: example-ae.c adapters/ae.h ${DYLIBNAME}
+       $(CC) -o $@ $(CCOPT) $(DEBUG) -I$(AE_DIR) $(LDFLAGS) -lhiredis example-ae.c $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o
+endif

 
 hiredis-%: %.o ${DYLIBNAME}
 
 hiredis-%: %.o ${DYLIBNAME}

-       $(CC) -o $@ $(CCOPT) $(DEBUG) -L. -lhiredis -Wl,-rpath,. $<
+       $(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) -lhiredis $<

 
 test: hiredis-test
        ./hiredis-test
 
 test: hiredis-test
        ./hiredis-test


@@ -90,13 +103,13 @@ install: ${DYLIBNAME} ${STLIBNAME}
        @echo ""
        @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
        @echo ""
        @echo ""
        @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
        @echo ""

-       make ARCH="-m32"
+       $(MAKE) ARCH="-m32"

 
 gprof:
 
 gprof:

-       make PROF="-pg"
+       $(MAKE) PROF="-pg"

 
 gcov:
 
 gcov:

-       make PROF="-fprofile-arcs -ftest-coverage"
+       $(MAKE) PROF="-fprofile-arcs -ftest-coverage"

 
 noopt:
 
 noopt:

-       make OPTIMIZATION=""
+       $(MAKE) OPTIMIZATION=""