From 74310245bf442eae413e4259aaabd47751c776c2 Mon Sep 17 00:00:00 2001 From: jamesge Date: Mon, 10 Feb 2020 17:03:22 +0800 Subject: [PATCH] make by config_brpc.sh shows commands by default, add -s to hide --- Makefile | 80 ++++++++++++------------ example/echo_c++/Makefile | 28 ++++----- example/http_c++/Makefile | 34 +++++----- example/memcache_c++/Makefile | 18 +++--- example/multi_threaded_echo_c++/Makefile | 28 ++++----- example/redis_c++/Makefile | 30 ++++----- example/thrift_extension_c++/Makefile | 44 ++++++------- test/Makefile | 56 ++++++++--------- tools/parallel_http/Makefile | 18 +++--- tools/rpc_press/Makefile | 18 +++--- tools/rpc_replay/Makefile | 18 +++--- tools/rpc_view/Makefile | 22 +++---- tools/trackme_server/Makefile | 18 +++--- 13 files changed, 206 insertions(+), 206 deletions(-) diff --git a/Makefile b/Makefile index 9c5ad779..3538e47c 100644 --- a/Makefile +++ b/Makefile @@ -227,107 +227,107 @@ debug: test/libbrpc.dbg.$(SOEXT) test/libbvar.dbg.a .PHONY:clean clean: - @echo "Cleaning" - @rm -rf src/mcpack2pb/generator.o protoc-gen-mcpack libbrpc.a libbrpc.$(SOEXT) $(OBJS) output/include output/lib output/bin $(PROTOS:.proto=.pb.h) $(PROTOS:.proto=.pb.cc) + @echo "> Cleaning" + rm -rf src/mcpack2pb/generator.o protoc-gen-mcpack libbrpc.a libbrpc.$(SOEXT) $(OBJS) output/include output/lib output/bin $(PROTOS:.proto=.pb.h) $(PROTOS:.proto=.pb.cc) .PHONY:clean_debug clean_debug: - @rm -rf test/libbrpc.dbg.$(SOEXT) test/libbvar.dbg.a $(DEBUG_OBJS) + rm -rf test/libbrpc.dbg.$(SOEXT) test/libbvar.dbg.a $(DEBUG_OBJS) .PRECIOUS: %.o protoc-gen-mcpack: src/idl_options.pb.cc src/mcpack2pb/generator.o libbrpc.a - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) -o $@ $(HDRPATHS) $(LIBPATHS) -std=c++0x -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) + $(CXX) -o $@ $(HDRPATHS) $(LIBPATHS) -std=c++0x -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) else ifeq ($(SYSTEM),Darwin) - @$(CXX) -o $@ $(HDRPATHS) $(LIBPATHS) -std=c++0x $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) + $(CXX) -o $@ $(HDRPATHS) $(LIBPATHS) -std=c++0x $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) endif # force generation of pb headers before compiling to avoid fail-to-import issues in compiling pb.cc libbrpc.a:$(BRPC_PROTOS:.proto=.pb.h) $(OBJS) - @echo "Packing $@" - @ar crs $@ $(filter %.o,$^) + @echo "> Packing $@" + ar crs $@ $(filter %.o,$^) libbrpc.$(SOEXT):$(BRPC_PROTOS:.proto=.pb.h) $(OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) -shared -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $(filter %.o,$^) -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) + $(CXX) -shared -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $(filter %.o,$^) -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) else ifeq ($(SYSTEM),Darwin) - @$(CXX) -dynamiclib -Wl,-headerpad_max_install_names -o $@ -install_name @rpath/$@ $(LIBPATHS) $(SOPATHS) $(filter %.o,$^) $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) + $(CXX) -dynamiclib -Wl,-headerpad_max_install_names -o $@ -install_name @rpath/$@ $(LIBPATHS) $(SOPATHS) $(filter %.o,$^) $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) endif test/libbvar.dbg.a:$(BVAR_DEBUG_OBJS) - @echo "Packing $@" + @echo "> Packing $@" @ar crs $@ $^ test/libbrpc.dbg.$(SOEXT):$(BRPC_PROTOS:.proto=.pb.h) $(DEBUG_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) -shared -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $(filter %.o,$^) -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) + $(CXX) -shared -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $(filter %.o,$^) -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) else ifeq ($(SYSTEM),Darwin) - @$(CXX) -dynamiclib -Wl,-headerpad_max_install_names -o $@ -install_name @rpath/libbrpc.dbg.$(SOEXT) $(LIBPATHS) $(SOPATHS) $(filter %.o,$^) $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) + $(CXX) -dynamiclib -Wl,-headerpad_max_install_names -o $@ -install_name @rpath/libbrpc.dbg.$(SOEXT) $(LIBPATHS) $(SOPATHS) $(filter %.o,$^) $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) endif .PHONY:output/include output/include: - @echo "Copying to $@" + @echo "> Copying to $@" @for dir in `find src -type f -name "*.h" -exec dirname {} \\; | sed -e 's/^src\///g' -e '/^src$$/d' | sort | uniq`; do mkdir -p $@/$$dir && cp src/$$dir/*.h $@/$$dir/; done @for dir in `find src -type f -name "*.hpp" -exec dirname {} \\; | sed -e 's/^src\///g' -e '/^src$$/d' | sort | uniq`; do mkdir -p $@/$$dir && cp src/$$dir/*.hpp $@/$$dir/; done @cp src/idl_options.proto src/idl_options.pb.h $@ .PHONY:output/lib output/lib:libbrpc.a libbrpc.$(SOEXT) - @echo "Copying to $@" + @echo "> Copying to $@" @mkdir -p $@ @cp $^ $@ .PHONY:output/bin output/bin:protoc-gen-mcpack - @echo "Copying to $@" + @echo "> Copying to $@" @mkdir -p $@ @cp $^ $@ %.pb.cc %.pb.h:%.proto - @echo "Generating $@" - @$(PROTOC) --cpp_out=./src --proto_path=./src --proto_path=$(PROTOBUF_HDR) $< + @echo "> Generating $@" + $(PROTOC) --cpp_out=./src --proto_path=./src --proto_path=$(PROTOBUF_HDR) $< %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %http2_rpc_protocol.dbg.o:%http2_rpc_protocol.cpp - @echo "Compiling $@ with O2" - @$(CXX) -c $(HDRPATHS) -O2 $(DEBUG_CXXFLAGS) $< -o $@ + @echo "> Compiling $@ with O2" + $(CXX) -c $(HDRPATHS) -O2 $(DEBUG_CXXFLAGS) $< -o $@ %hpack.dbg.o:%hpack.cpp - @echo "Compiling $@ with O2" - @$(CXX) -c $(HDRPATHS) -O2 $(DEBUG_CXXFLAGS) $< -o $@ + @echo "> Compiling $@ with O2" + $(CXX) -c $(HDRPATHS) -O2 $(DEBUG_CXXFLAGS) $< -o $@ %.dbg.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(DEBUG_CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(DEBUG_CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.dbg.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(DEBUG_CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(DEBUG_CXXFLAGS) $< -o $@ %.o:%.mm - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.dbg.o:%.mm - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(DEBUG_CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(DEBUG_CXXFLAGS) $< -o $@ %.o:%.c - @echo "Compiling $@" - @$(CC) -c $(HDRPATHS) $(CFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CC) -c $(HDRPATHS) $(CFLAGS) $< -o $@ %.dbg.o:%.c - @echo "Compiling $@" - @$(CC) -c $(HDRPATHS) $(DEBUG_CFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CC) -c $(HDRPATHS) $(DEBUG_CFLAGS) $< -o $@ diff --git a/example/echo_c++/Makefile b/example/echo_c++/Makefile index 725bb680..710cc7ed 100644 --- a/example/echo_c++/Makefile +++ b/example/echo_c++/Makefile @@ -62,33 +62,33 @@ all: echo_client echo_server .PHONY:clean clean: - @echo "Cleaning" - @rm -rf echo_client echo_server $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) $(SERVER_OBJS) + @echo "> Cleaning" + rm -rf echo_client echo_server $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) $(SERVER_OBJS) echo_client:$(PROTO_OBJS) $(CLIENT_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif echo_server:$(PROTO_OBJS) $(SERVER_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif %.pb.cc %.pb.h:%.proto - @echo "Generating $@" - @$(PROTOC) --cpp_out=. --proto_path=. $(PROTOC_EXTRA_ARGS) $< + @echo "> Generating $@" + $(PROTOC) --cpp_out=. --proto_path=. $(PROTOC_EXTRA_ARGS) $< %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/example/http_c++/Makefile b/example/http_c++/Makefile index f978af34..dc9d430f 100644 --- a/example/http_c++/Makefile +++ b/example/http_c++/Makefile @@ -63,41 +63,41 @@ all: http_client benchmark_http http_server .PHONY:clean clean: - @echo "Cleaning" - @rm -rf http_client benchmark_http http_server $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) $(BENCHMARK_OBJS) $(SERVER_OBJS) + @echo "> Cleaning" + rm -rf http_client benchmark_http http_server $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) $(BENCHMARK_OBJS) $(SERVER_OBJS) http_client:$(CLIENT_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif benchmark_http:$(BENCHMARK_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif http_server:$(PROTO_OBJS) $(SERVER_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif %.pb.cc %.pb.h:%.proto - @echo "Generating $@" - @$(PROTOC) --cpp_out=. --proto_path=. $< + @echo "> Generating $@" + $(PROTOC) --cpp_out=. --proto_path=. $< %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/example/memcache_c++/Makefile b/example/memcache_c++/Makefile index d991fc04..2579f68f 100644 --- a/example/memcache_c++/Makefile +++ b/example/memcache_c++/Makefile @@ -48,21 +48,21 @@ all: memcache_client .PHONY:clean clean: - @echo "Cleaning" - @rm -rf memcache_client $(OBJS) + @echo "> Cleaning" + rm -rf memcache_client $(OBJS) memcache_client:$(OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/example/multi_threaded_echo_c++/Makefile b/example/multi_threaded_echo_c++/Makefile index e9af4ba9..558b77c3 100644 --- a/example/multi_threaded_echo_c++/Makefile +++ b/example/multi_threaded_echo_c++/Makefile @@ -62,33 +62,33 @@ all: echo_client echo_server .PHONY:clean clean: - @echo "Cleaning" - @rm -rf echo_client echo_server $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) $(SERVER_OBJS) + @echo "> Cleaning" + rm -rf echo_client echo_server $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) $(SERVER_OBJS) echo_client:$(PROTO_OBJS) $(CLIENT_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif echo_server:$(PROTO_OBJS) $(SERVER_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif %.pb.cc %.pb.h:%.proto - @echo "Generating $@" - @$(PROTOC) --cpp_out=. --proto_path=. $(PROTOC_EXTRA_ARGS) $< + @echo "> Generating $@" + $(PROTOC) --cpp_out=. --proto_path=. $(PROTOC_EXTRA_ARGS) $< %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/example/redis_c++/Makefile b/example/redis_c++/Makefile index 2f28bde7..4ba9505f 100644 --- a/example/redis_c++/Makefile +++ b/example/redis_c++/Makefile @@ -54,37 +54,37 @@ all: redis_press redis_cli redis_server .PHONY:clean clean: - @echo "Cleaning" - @rm -rf redis_press redis_cli $(PRESS_OBJS) $(CLI_OBJS) $(SERVER_OBJS) + @echo "> Cleaning" + rm -rf redis_press redis_cli $(PRESS_OBJS) $(CLI_OBJS) $(SERVER_OBJS) redis_press:$(PRESS_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif redis_cli:$(CLI_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif redis_server:$(SERVER_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifneq ("$(LINK_SO)", "") - @$(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ + $(CXX) $(LIBPATHS) $(SOPATHS) $(LINK_OPTIONS_SO) -o $@ else - @$(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ + $(CXX) $(LIBPATHS) $(LINK_OPTIONS) -o $@ endif %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/example/thrift_extension_c++/Makefile b/example/thrift_extension_c++/Makefile index 7cb6b606..980b2085 100644 --- a/example/thrift_extension_c++/Makefile +++ b/example/thrift_extension_c++/Makefile @@ -53,43 +53,43 @@ all: echo_client echo_client2 echo_server echo_server2 native_server native_clie .PHONY:clean clean: - @echo "Cleaning" - @rm -rf echo_client echo_client2 echo_server echo_server2 $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) $(CLIENT2_OBJS) $(SERVER_OBJS) $(SERVER2_OBJS) native_server native_client EchoService.o echo_types.o libechothrift.a gen-cpp gen-py + @echo "> Cleaning" + rm -rf echo_client echo_client2 echo_server echo_server2 $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) $(CLIENT2_OBJS) $(SERVER_OBJS) $(SERVER2_OBJS) native_server native_client EchoService.o echo_types.o libechothrift.a gen-cpp gen-py echo_client:$(PROTO_OBJS) $(CLIENT_OBJS) libechothrift.a - @echo "Linking $@" - @$(CXX) $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ + @echo "> Linking $@" + $(CXX) $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ echo_client2:$(PROTO_OBJS) $(CLIENT2_OBJS) libechothrift.a - @echo "Linking $@" - @$(CXX) $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ + @echo "> Linking $@" + $(CXX) $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ echo_server:$(PROTO_OBJS) $(SERVER_OBJS) libechothrift.a - @echo "Linking $@" - @$(CXX) $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ libechothrift.a -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ + @echo "> Linking $@" + $(CXX) $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ libechothrift.a -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ echo_server2:$(PROTO_OBJS) $(SERVER2_OBJS) libechothrift.a - @echo "Linking $@" - @$(CXX) $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ libechothrift.a -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ + @echo "> Linking $@" + $(CXX) $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ libechothrift.a -Xlinker "-)" $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ %.o:%.cpp libechothrift.a - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc libechothrift.a - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ libechothrift.a: - @echo "Generating thrift files" - @thrift --gen cpp echo.thrift - @thrift --gen py echo.thrift - @$(CXX) -c gen-cpp/echo_types.cpp -o echo_types.o - @$(CXX) -c gen-cpp/EchoService.cpp -o EchoService.o - @ar -crv libechothrift.a EchoService.o echo_types.o + @echo "> Generating thrift files" + thrift --gen cpp echo.thrift + thrift --gen py echo.thrift + $(CXX) -c gen-cpp/echo_types.cpp -o echo_types.o + $(CXX) -c gen-cpp/EchoService.cpp -o EchoService.o + ar -crv libechothrift.a EchoService.o echo_types.o native_server: libechothrift.a - @$(CXX) native_server.cpp gen-cpp/echo_types.cpp gen-cpp/EchoService.cpp $(HDRPATHS) $(LIBPATHS) $(SOPATHS) $(CXXFLAGS) -lthriftnb -lthrift -levent -lpthread -lgflags -lbrpc -o native_server + $(CXX) native_server.cpp gen-cpp/echo_types.cpp gen-cpp/EchoService.cpp $(HDRPATHS) $(LIBPATHS) $(SOPATHS) $(CXXFLAGS) -lthriftnb -lthrift -levent -lpthread -lgflags -lbrpc -o native_server native_client: libechothrift.a - @$(CXX) native_client.cpp gen-cpp/echo_types.cpp gen-cpp/EchoService.cpp $(HDRPATHS) $(LIBPATHS) $(SOPATHS) $(CXXFLAGS) -lthriftnb -lthrift -levent -lpthread -lgflags -lbrpc -o native_client + $(CXX) native_client.cpp gen-cpp/echo_types.cpp gen-cpp/EchoService.cpp $(HDRPATHS) $(LIBPATHS) $(SOPATHS) $(CXXFLAGS) -lthriftnb -lthrift -levent -lpthread -lgflags -lbrpc -o native_client diff --git a/test/Makefile b/test/Makefile index acac9f77..9a63dc1a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -178,73 +178,73 @@ all: $(TEST_BINS) .PHONY:clean clean:clean_bins - @echo "Cleaning" - @rm -rf $(TEST_BUTIL_OBJS) $(TEST_BVAR_OBJS) $(TEST_BTHREAD_OBJS) $(TEST_BRPC_OBJS) $(TEST_PROTO_OBJS) $(TEST_PROTO_SOURCES:.proto=.pb.h) $(TEST_PROTO_SOURCES:.proto=.pb.cc) - @$(MAKE) -C.. clean_debug + @echo "> Cleaning" + rm -rf $(TEST_BUTIL_OBJS) $(TEST_BVAR_OBJS) $(TEST_BTHREAD_OBJS) $(TEST_BRPC_OBJS) $(TEST_PROTO_OBJS) $(TEST_PROTO_SOURCES:.proto=.pb.h) $(TEST_PROTO_SOURCES:.proto=.pb.cc) + $(MAKE) -C.. clean_debug .PHONY:clean_bins clean_bins: - @rm -rf $(TEST_BINS) + rm -rf $(TEST_BINS) libbrpc.dbg.$(SOEXT):FORCE - @$(MAKE) -C.. test/libbrpc.dbg.$(SOEXT) + $(MAKE) -C.. test/libbrpc.dbg.$(SOEXT) libbvar.dbg.a:FORCE - @$(MAKE) -C.. test/libbvar.dbg.a + $(MAKE) -C.. test/libbvar.dbg.a FORCE: .PRECIOUS: %.o test_butil:$(TEST_BUTIL_OBJS) | libbrpc.dbg.$(SOEXT) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) + $(CXX) -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) else ifeq ($(SYSTEM),Darwin) - @$(CXX) -o $@ $(LIBPATHS) $(SOPATHS) $^ $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) + $(CXX) -o $@ $(LIBPATHS) $(SOPATHS) $^ $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) endif test_bvar:libbvar.dbg.a $(TEST_BVAR_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) + $(CXX) -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) else ifeq ($(SYSTEM),Darwin) - @$(CXX) -o $@ $(LIBPATHS) $(SOPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) + $(CXX) -o $@ $(LIBPATHS) $(SOPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) endif bthread%unittest:bthread%unittest.o | libbrpc.dbg.$(SOEXT) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) + $(CXX) -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) else ifeq ($(SYSTEM),Darwin) - @$(CXX) -o $@ $(LIBPATHS) $(SOPATHS) $^ $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) + $(CXX) -o $@ $(LIBPATHS) $(SOPATHS) $^ $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) endif brpc_%_unittest:$(TEST_PROTO_OBJS) brpc_%_unittest.o | libbrpc.dbg.$(SOEXT) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) + $(CXX) -o $@ $(LIBPATHS) $(SOPATHS) -Xlinker "-(" $^ -Xlinker "-)" $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) else ifeq ($(SYSTEM),Darwin) - @$(CXX) -o $@ $(LIBPATHS) $(SOPATHS) $^ $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) + $(CXX) -o $@ $(LIBPATHS) $(SOPATHS) $^ $(STATIC_LINKINGS) $(UT_DYNAMIC_LINKINGS) endif %.pb.cc %.pb.h:%.proto - @echo "Generating $@" - @$(PROTOC) --cpp_out=. --proto_path=. --proto_path=../src --proto_path=$(PROTOBUF_HDR) $< + @echo "> Generating $@" + $(PROTOC) --cpp_out=. --proto_path=. --proto_path=../src --proto_path=$(PROTOBUF_HDR) $< baidu_time_unittest.o:baidu_time_unittest.cpp | libbrpc.dbg.$(SOEXT) - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) -O2 $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) -O2 $(CXXFLAGS) $< -o $@ brpc_h2_unsent_message_unittest.o:brpc_h2_unsent_message_unittest.cpp | libbrpc.dbg.$(SOEXT) - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) -O2 $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) -O2 $(CXXFLAGS) $< -o $@ %.o:%.cpp | libbrpc.dbg.$(SOEXT) - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc | libbrpc.dbg.$(SOEXT) - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/tools/parallel_http/Makefile b/tools/parallel_http/Makefile index 0336c244..5b866470 100644 --- a/tools/parallel_http/Makefile +++ b/tools/parallel_http/Makefile @@ -30,21 +30,21 @@ all: parallel_http .PHONY:clean clean: - @echo "Cleaning" - @rm -rf parallel_http $(OBJS) + @echo "> Cleaning" + rm -rf parallel_http $(OBJS) parallel_http:$(OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ else ifeq ($(SYSTEM),Darwin) - @$(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ endif %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/tools/rpc_press/Makefile b/tools/rpc_press/Makefile index 29d52c76..c1d866d0 100644 --- a/tools/rpc_press/Makefile +++ b/tools/rpc_press/Makefile @@ -30,21 +30,21 @@ all: rpc_press .PHONY:clean clean: - @echo "Cleaning" - @rm -rf rpc_press $(OBJS) + @echo "> Cleaning" + rm -rf rpc_press $(OBJS) rpc_press:$(OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ else ifeq ($(SYSTEM),Darwin) - @$(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ endif %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/tools/rpc_replay/Makefile b/tools/rpc_replay/Makefile index 20053e9e..fcd5eb6f 100644 --- a/tools/rpc_replay/Makefile +++ b/tools/rpc_replay/Makefile @@ -30,21 +30,21 @@ all: rpc_replay .PHONY:clean clean: - @echo "Cleaning" - @rm -rf rpc_replay $(OBJS) + @echo "> Cleaning" + rm -rf rpc_replay $(OBJS) rpc_replay:$(OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ else ifeq ($(SYSTEM),Darwin) - @$(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ endif %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/tools/rpc_view/Makefile b/tools/rpc_view/Makefile index 7c555f3c..c654cfd5 100644 --- a/tools/rpc_view/Makefile +++ b/tools/rpc_view/Makefile @@ -37,25 +37,25 @@ all: rpc_view .PHONY:clean clean: - @echo "Cleaning" - @rm -rf rpc_view $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) + @echo "> Cleaning" + rm -rf rpc_view $(PROTO_GENS) $(PROTO_OBJS) $(CLIENT_OBJS) rpc_view:$(PROTO_OBJS) $(CLIENT_OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ else ifeq ($(SYSTEM),Darwin) - @$(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ endif %.pb.cc %.pb.h:%.proto - @echo "Generating $@" - @$(PROTOC) --cpp_out=. --proto_path=. $(PROTOC_EXTRA_ARGS) $< + @echo "> Generating $@" + $(PROTOC) --cpp_out=. --proto_path=. $(PROTOC_EXTRA_ARGS) $< %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ diff --git a/tools/trackme_server/Makefile b/tools/trackme_server/Makefile index e3ca235b..79e8536d 100644 --- a/tools/trackme_server/Makefile +++ b/tools/trackme_server/Makefile @@ -30,21 +30,21 @@ all: trackme_server .PHONY:clean clean: - @echo "Cleaning" - @rm -rf trackme_server $(OBJS) + @echo "> Cleaning" + rm -rf trackme_server $(OBJS) trackme_server:$(OBJS) - @echo "Linking $@" + @echo "> Linking $@" ifeq ($(SYSTEM),Linux) - @$(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) -o $@ else ifeq ($(SYSTEM),Darwin) - @$(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ + $(CXX) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS) -o $@ endif %.o:%.cpp - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ %.o:%.cc - @echo "Compiling $@" - @$(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@ + @echo "> Compiling $@" + $(CXX) -c $(HDRPATHS) $(CXXFLAGS) $< -o $@