Minor changes to Makefile

[redis.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 51ac2d47af89955ce8edbda794e42a0ef785067e..08f93f7af607ac47a3c7e8a5fdf6cd850c8f81a2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,7 +26,7 @@ INSTALL= cp -p
 
 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 sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o
 BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
 
 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 sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.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 release.o

 CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o
 CHECKAOFOBJ = redis-check-aof.o
 
 CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o
 CHECKAOFOBJ = redis-check-aof.o
 


@@ -37,6 +37,9 @@ CHECKDUMPPRGNAME = redis-check-dump
 CHECKAOFPRGNAME = redis-check-aof
 
 all: redis-benchmark redis-cli redis-check-dump redis-check-aof redis-server
 CHECKAOFPRGNAME = redis-check-aof
 
 all: redis-benchmark redis-cli redis-check-dump redis-check-aof redis-server

+       @echo ""
+       @echo "Hint: To run 'make test' is a good idea ;)"
+       @echo ""

 
 # Deps (use make dep to generate this)
 adlist.o: adlist.c adlist.h zmalloc.h
 
 # Deps (use make dep to generate this)
 adlist.o: adlist.c adlist.h zmalloc.h


@@ -102,22 +105,21 @@ ziplist.o: ziplist.c zmalloc.h ziplist.h
 zipmap.o: zipmap.c zmalloc.h
 zmalloc.o: zmalloc.c config.h
 
 zipmap.o: zipmap.c zmalloc.h
 zmalloc.o: zmalloc.c config.h
 

+dependencies:
+       cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
+       cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
+

 redis-server: $(OBJ)
        $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
 redis-server: $(OBJ)
        $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)

-       @echo ""
-       @echo "Hint: To run 'make test' is a good idea ;)"
-       @echo ""

 
 

-redis-benchmark: $(BENCHOBJ)
-       cd ../deps/hiredis && make static
+redis-benchmark: dependencies $(BENCHOBJ)
+       cd ../deps/hiredis && $(MAKE) static

        $(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a
 
 redis-benchmark.o:
        $(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
 
        $(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a
 
 redis-benchmark.o:
        $(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
 

-redis-cli: $(CLIOBJ)
-       cd ../deps/hiredis && make static ARCH="$(ARCH)"
-       cd ../deps/linenoise && make ARCH="$(ARCH)"
+redis-cli: dependencies $(CLIOBJ)

        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
 
 redis-cli.o:
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
 
 redis-cli.o:


@@ -134,13 +136,11 @@ 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 clean
-       cd ../deps/linenoise && make clean

 
 dep:
        $(CC) -MM *.c
 
 
 dep:
        $(CC) -MM *.c
 

-test:
+test: redis-server

        (cd ..; tclsh8.5 tests/test_helper.tcl --tags "${TAGS}" --file "${FILE}")
 
 bench:
        (cd ..; tclsh8.5 tests/test_helper.tcl --tags "${TAGS}" --file "${FILE}")
 
 bench:


@@ -153,19 +153,19 @@ log:
        @echo ""
        @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
        @echo ""
        @echo ""
        @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
        @echo ""

-       make ARCH="-m32"
+       $(MAKE) ARCH="-m32"

 
 gprof:
 
 gprof:

-       make PROF="-pg"
+       $(MAKE) PROF="-pg"

 
 gcov:
 
 gcov:

-       make PROF="-fprofile-arcs -ftest-coverage"
+       $(MAKE) PROF="-fprofile-arcs -ftest-coverage"

 
 noopt:
 
 noopt:

-       make OPTIMIZATION=""
+       $(MAKE) OPTIMIZATION=""

 
 32bitgprof:
 
 32bitgprof:

-       make PROF="-pg" ARCH="-arch i386"
+       $(MAKE) PROF="-pg" ARCH="-arch i386"

 
 install: all
        mkdir -p $(INSTALL_BIN)
 
 install: all
        mkdir -p $(INSTALL_BIN)