diff options
author | antirez <antirez@gmail.com> | 2010-01-19 13:02:02 -0500 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2010-01-19 13:02:02 -0500 |
commit | 970e10bb34690746ba378b0408ec37e7f7b57040 (patch) | |
tree | 8d004cccbda8ae3d710292a9b959f6f0e36d5006 /Makefile | |
parent | 33843a90aaff50805cb3c74f587d1ef204c036c4 (diff) | |
download | redis-970e10bb34690746ba378b0408ec37e7f7b57040.tar.gz |
removed a bug in the function to cancel an I/O job
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -15,26 +15,33 @@ 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 -BENCHOBJ = ae.o anet.o benchmark.o sds.o adlist.o zmalloc.o +BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o +LOADOBJ = ae.o anet.o redis-load.o sds.o adlist.o zmalloc.o PRGNAME = redis-server BENCHPRGNAME = redis-benchmark CLIPRGNAME = redis-cli +LOADPRGNAME = redis-load all: redis-server redis-benchmark redis-cli +cotools: redis-load # Deps (use make dep to generate this) adlist.o: adlist.c adlist.h zmalloc.h -ae.o: ae.c ae.h zmalloc.h ae_select.c ae_epoll.c +ae.o: ae.c ae.h zmalloc.h config.h ae_kqueue.c +ae_epoll.o: ae_epoll.c +ae_kqueue.o: ae_kqueue.c ae_select.o: ae_select.c anet.o: anet.c fmacros.h anet.h -benchmark.o: benchmark.c fmacros.h ae.h anet.h sds.h adlist.h zmalloc.h dict.o: dict.c fmacros.h dict.h zmalloc.h lzf_c.o: lzf_c.c lzfP.h lzf_d.o: lzf_d.c lzfP.h pqsort.o: pqsort.c +redis-benchmark.o: redis-benchmark.c fmacros.h ae.h anet.h sds.h adlist.h \ + zmalloc.h redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h +redis-load.o: redis-load.c fmacros.h ae.h anet.h sds.h adlist.h zmalloc.h redis.o: redis.c fmacros.h config.h redis.h ae.h sds.h anet.h dict.h \ adlist.h zmalloc.h lzf.h pqsort.h staticsymbols.h sds.o: sds.c sds.h zmalloc.h @@ -54,11 +61,14 @@ redis-benchmark: $(BENCHOBJ) redis-cli: $(CLIOBJ) $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) +redis-load: $(LOADOBJ) + $(CC) -o $(LOADPRGNAME) $(CCOPT) $(DEBUG) $(LOADOBJ) + .c.o: $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $< clean: - rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o *.gcda *.gcno *.gcov + rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(LOADPRGNAME) *.o *.gcda *.gcno *.gcov dep: $(CC) -MM *.c |