Use hiredis from redis-cli

[redis.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 6f09200e1cd0aede8fbd443f838bebd2cac6aa40..bd362bc0184ee5e9ab0b8b3961b7f43d54764d6d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -114,7 +114,11 @@ redis-benchmark: $(BENCHOBJ)
        $(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ)
 
 redis-cli: $(CLIOBJ)
-       $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
+       cd ../deps/hiredis && make static
+       $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a
+
+redis-cli.o:
+       $(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
 
 redis-check-dump: $(CHECKDUMPOBJ)
        $(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
@@ -132,7 +136,7 @@ dep:
        $(CC) -MM *.c
 
 test:
-       (cd ..; tclsh8.5 tests/test_helper.tcl --tags "${TAGS}")
+       (cd ..; tclsh8.5 tests/test_helper.tcl --tags "${TAGS}" --file "${FILE}")
 
 bench:
        ./redis-benchmark