build redis-server at the end so have a more pleasing to see Make output and the...

[redis.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index ad211bed13c561255193fc55be2968aa9bbccfae..51ac2d47af89955ce8edbda794e42a0ef785067e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -36,7 +36,7 @@ CLIPRGNAME = redis-cli
 CHECKDUMPPRGNAME = redis-check-dump
 CHECKAOFPRGNAME = redis-check-aof
 
-all: redis-server redis-benchmark redis-cli redis-check-dump redis-check-aof
+all: redis-benchmark redis-cli redis-check-dump redis-check-aof redis-server
 
 # Deps (use make dep to generate this)
 adlist.o: adlist.c adlist.h zmalloc.h
@@ -116,8 +116,8 @@ redis-benchmark.o:
        $(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
 
 redis-cli: $(CLIOBJ)
-       cd ../deps/hiredis && make static
-       cd ../deps/linenoise && make
+       cd ../deps/hiredis && make static ARCH="$(ARCH)"
+       cd ../deps/linenoise && make ARCH="$(ARCH)"
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
 
 redis-cli.o:
@@ -134,6 +134,8 @@ redis-check-aof: $(CHECKAOFOBJ)
 
 clean:
        rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov
+       cd ../deps/hiredis && make clean
+       cd ../deps/linenoise && make clean
 
 dep:
        $(CC) -MM *.c