zeekling/hiredis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move libev/libevent headers to adapters directory

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-11-01 10:42:32 +01:00
parent d5fc7d8c53
commit 89e0622535
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -37,11 +37,12 @@ all: ${DYLIBNAME} ${BINS}
# Deps (use make dep to generate this) # Deps (use make dep to generate this)
anet.o: anet.c fmacros.h anet.h anet.o: anet.c fmacros.h anet.h
async.o: async.c async.h hiredis.h sds.h util.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
example.o: example.c hiredis.h example.o: example.c hiredis.h
hiredis.o: hiredis.c hiredis.h anet.h sds.h util.h hiredis.o: hiredis.c hiredis.h anet.h sds.h util.h
sds.o: sds.c sds.h sds.o: sds.c sds.h
test.o: test.c hiredis.h test.o: test.c hiredis.h
${DYLIBNAME}: ${OBJ} ${DYLIBNAME}: ${OBJ}
${DYLIB_MAKE_CMD} ${DYLIB_MAKE_CMD}
@ -52,23 +53,23 @@ dynamic: ${DYLIBNAME}
static: ${STLIBNAME} static: ${STLIBNAME}
# Binaries: # Binaries:
hiredis-example-libevent: ${DYLIBNAME}
$(CC) -o $@ $(CCOPT) $(DEBUG) -L. -lhiredis -levent -Wl,-rpath,. example-libevent.c
hiredis-example-libev: ${DYLIBNAME}
$(CC) -o $@ $(CCOPT) $(DEBUG) -L. -lhiredis -lev -Wl,-rpath,. example-libev.c
hiredis-%: %.o ${DYLIBNAME} hiredis-%: %.o ${DYLIBNAME}
$(CC) -o $@ $(CCOPT) $(DEBUG) -L. -l hiredis -Wl,-rpath,. $< $(CC) -o $@ $(CCOPT) $(DEBUG) -L. -lhiredis -Wl,-rpath,. $<
test: hiredis-test test: hiredis-test
./hiredis-test ./hiredis-test
libevent-example: extra/hiredis/libevent.h libevent-example.c ${DYLIBNAME}
$(CC) -o $@ $(CCOPT) $(DEBUG) -I. -Iextra -L. -lhiredis -levent libevent-example.c
libev-example: extra/hiredis/libev.h libev-example.c ${DYLIBNAME}
$(CC) -o $@ $(CCOPT) $(DEBUG) -I. -Iextra -L. -lhiredis -lev libev-example.c
.c.o: .c.o:
$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $< $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
clean: clean:
rm -rf ${DYLIBNAME} ${STLIBNAME} $(BINS) *-example *.o *.gcda *.gcno *.gcov rm -rf ${DYLIBNAME} ${STLIBNAME} $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov
dep: dep:
$(CC) -MM *.c $(CC) -MM *.c

4
extra/hiredis/libev.h → adapters/libev.h
View File

@ -1,7 +1,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <ev.h> #include <ev.h>
#include <hiredis.h> #include "../hiredis.h"
#include <async.h> #include "../async.h"
typedef struct redisLibevEvents { typedef struct redisLibevEvents {
redisAsyncContext *context; redisAsyncContext *context;

4
extra/hiredis/libevent.h → adapters/libevent.h
View File

@ -1,7 +1,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <event.h> #include <event.h>
#include <hiredis.h> #include "../hiredis.h"
#include <async.h> #include "../async.h"
typedef struct redisLibeventEvents { typedef struct redisLibeventEvents {
redisAsyncContext *context; redisAsyncContext *context;

5
libev-example.c → example-libev.c
View File

@ -1,9 +1,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <hiredis/libev.h>
#include <async.h>
#include <signal.h> #include <signal.h>
#include "hiredis.h"
#include "async.h"
#include "adapters/libev.h"
void getCallback(redisAsyncContext *c, redisReply *reply, void *privdata) { void getCallback(redisAsyncContext *c, redisReply *reply, void *privdata) {
printf("argv[%s]: %s\n", (char*)privdata, reply->str); printf("argv[%s]: %s\n", (char*)privdata, reply->str);

5
libevent-example.c → example-libevent.c
View File

@ -1,9 +1,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <hiredis/libevent.h>
#include <async.h>
#include <signal.h> #include <signal.h>
#include "hiredis.h"
#include "async.h"
#include "adapters/libevent.h"
void getCallback(redisAsyncContext *c, redisReply *reply, void *privdata) { void getCallback(redisAsyncContext *c, redisReply *reply, void *privdata) {
printf("argv[%s]: %s\n", (char*)privdata, reply->str); printf("argv[%s]: %s\n", (char*)privdata, reply->str);