mirror of
https://github.com/fluencelabs/redis
synced 2025-05-16 20:41:19 +00:00
Fix Makefile colors.
echo with escape sequences isn't portable. Use printf instead.
This commit is contained in:
parent
7638130d6e
commit
4dfecf64e1
12
src/Makefile
12
src/Makefile
@ -14,8 +14,8 @@ MAKECOLOR="\033[32;1m"
|
|||||||
ENDCOLOR="\033[0m"
|
ENDCOLOR="\033[0m"
|
||||||
|
|
||||||
ifndef V
|
ifndef V
|
||||||
QUIET_CC = @echo ' ' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR);
|
QUIET_CC = @printf ' %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR);
|
||||||
QUIET_LINK = @echo ' ' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
|
QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(uname_S),Linux)
|
ifeq ($(uname_S),Linux)
|
||||||
@ -144,20 +144,20 @@ zmalloc.o: zmalloc.c config.h zmalloc.h
|
|||||||
.PHONY: dependencies
|
.PHONY: dependencies
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
@echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
|
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
|
||||||
@cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
|
@cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
|
||||||
@echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR)
|
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR)
|
||||||
@cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
|
@cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
|
||||||
|
|
||||||
../deps/jemalloc/lib/libjemalloc.a:
|
../deps/jemalloc/lib/libjemalloc.a:
|
||||||
@echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)jemalloc$(ENDCOLOR)
|
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)jemalloc$(ENDCOLOR)
|
||||||
@cd ../deps/jemalloc && ./configure $(JEMALLOC_CFLAGS) --with-jemalloc-prefix=je_ --enable-cc-silence && $(MAKE) lib/libjemalloc.a
|
@cd ../deps/jemalloc && ./configure $(JEMALLOC_CFLAGS) --with-jemalloc-prefix=je_ --enable-cc-silence && $(MAKE) lib/libjemalloc.a
|
||||||
|
|
||||||
redis-benchmark.o:
|
redis-benchmark.o:
|
||||||
$(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
|
$(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
|
||||||
|
|
||||||
redis-benchmark: dependencies $(BENCHOBJ)
|
redis-benchmark: dependencies $(BENCHOBJ)
|
||||||
@echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
|
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
|
||||||
@cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
|
@cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
|
||||||
$(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(CCLINK) $(ALLOC_LINK)
|
$(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(CCLINK) $(ALLOC_LINK)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user