HDEL: Abort deleting fields when hash is removed

[redis.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index d3567aa7d490fd1da6002ae0e5e7821db7585ae3..ee4bfc5001986fa6dee246fcb33b63a43a246273 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -198,12 +198,16 @@ redis-check-aof: $(CHECKAOFOBJ)
 
 clean:
        rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov
 
 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
 
 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
 
 bench:
        ./redis-benchmark


@@ -229,6 +233,9 @@ noopt:
 32bitgprof:
        $(MAKE) PROF="-pg" ARCH="-arch i386"
 
 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)
 install: all
        mkdir -p $(INSTALL_BIN)
        $(INSTALL) $(PRGNAME) $(INSTALL_BIN)