X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/4583c4f0ea0ef3cdb3cd1b0ede77e5b95be18327..c44d3b56df4ce4cae1c2e6db6397eaab9651ff7a:/Makefile diff --git a/Makefile b/Makefile index df840313..aea43f1d 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,12 @@ else endif CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) DEBUG?= -g -rdynamic -ggdb +HOST?= 127.0.0.1 +PORT?= 6379 OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.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 +CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o linenoise.o CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o PRGNAME = redis-server @@ -34,12 +36,15 @@ ae_kqueue.o: ae_kqueue.c ae_select.o: ae_select.c anet.o: anet.c fmacros.h anet.h dict.o: dict.c fmacros.h dict.h zmalloc.h +linenoise.o: linenoise.c 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-check-dump.o: redis-check-dump.c lzf.h +redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h \ + linenoise.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 zipmap.h staticsymbols.h sds.o: sds.c sds.h zmalloc.h @@ -76,13 +81,13 @@ staticsymbols: tclsh utils/build-static-symbols.tcl > staticsymbols.h test: - tclsh test-redis.tcl + tclsh test-redis.tcl -p $(PORT) -h $(HOST) bench: ./redis-benchmark log: - git log '--pretty=format:%ad %s' --date=short > Changelog + git log '--pretty=format:%ad %s (%cn)' --date=short > Changelog 32bit: @echo ""