Move to struct.

[redis.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index ac0db5770af95ffa68d41973b1897c239c0f5c4f..70e15ae399d956012841b6755db30c70aa33d665 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -109,15 +109,15 @@ redis-server: $(OBJ)
        @echo ""
 
 redis-benchmark: $(BENCHOBJ)
        @echo ""
 
 redis-benchmark: $(BENCHOBJ)

-       cd ../deps/hiredis && make static
+       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) $<
 
 redis-cli: $(CLIOBJ)
        $(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)"
+       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:
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
 
 redis-cli.o:


@@ -134,8 +134,8 @@ 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
+       cd ../deps/hiredis && $(MAKE) clean
+       cd ../deps/linenoise && $(MAKE) clean

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


@@ -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)