X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/331bf3292f249fac99226c591b40fd64a8d7106a..4d6bf65c42d213c716c5878343b9e1456ffcd327:/src/Makefile?ds=sidebyside diff --git a/src/Makefile b/src/Makefile index d3567aa7..a45002de 100644 --- a/src/Makefile +++ b/src/Makefile @@ -169,7 +169,7 @@ dependencies: ../deps/jemalloc/lib/libjemalloc.a: cd ../deps/jemalloc && ./configure $(JEMALLOC_CFLAGS) --with-jemalloc-prefix=je_ --enable-cc-silence && $(MAKE) lib/libjemalloc.a -redis-server: $(OBJ) +redis-server: dependencies $(OBJ) $(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(CCLINK) $(ALLOC_LINK) ../deps/lua/src/liblua.a redis-benchmark: dependencies $(BENCHOBJ) @@ -198,12 +198,16 @@ redis-check-aof: $(CHECKAOFOBJ) clean: rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov + cd ../deps/hiredis && $(MAKE) $@ + cd ../deps/linenoise && $(MAKE) $@ + cd ../deps/lua && $(MAKE) $@ + -(cd ../deps/jemalloc && $(MAKE) distclean) dep: $(CC) -MM *.c -I ../deps/hiredis -I ../deps/linenoise test: redis-server redis-check-aof - @(cd ..; (which tclsh8.5 >/dev/null && tclsh8.5 tests/test_helper.tcl --tags "${TAGS}") || echo "You need to install Tcl (tclsh8.5) in order to run tests.") + @(cd ..; ./runtest) bench: ./redis-benchmark @@ -229,6 +233,9 @@ noopt: 32bitgprof: $(MAKE) PROF="-pg" ARCH="-arch i386" +src/help.h: + @../utils/generate-command-help.rb > help.h + install: all mkdir -p $(INSTALL_BIN) $(INSTALL) $(PRGNAME) $(INSTALL_BIN)