From a46adf2bbe62c3d2dd9c299663893770f82fb4b7 Mon Sep 17 00:00:00 2001 From: qiao hai-jun Date: Fri, 31 Aug 2018 15:18:12 +0800 Subject: [PATCH] [refactor] more readability --- phxrpc/Makefile | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/phxrpc/Makefile b/phxrpc/Makefile index a4184cf..72b4ace 100644 --- a/phxrpc/Makefile +++ b/phxrpc/Makefile @@ -1,20 +1,34 @@ include ../phxrpc.mk -LIB_HTTP_OBJS = http/http_client.o http/http_msg.o http/http_msg_handler.o http/http_protocol.o \ +LIB_HTTP_OBJS = http/http_client.o \ + http/http_msg.o \ + http/http_msg_handler.o \ + http/http_protocol.o \ http/http_msg_handler_factory.o -LIB_NETWORK_OBJS = network/socket_stream_base.o network/uthread_runtime.o \ - network/uthread_epoll.o network/socket_stream_block.o \ - network/socket_stream_uthread.o network/uthread_context_util.o \ - network/uthread_context_base.o network/uthread_context_system.o \ +LIB_NETWORK_OBJS = network/socket_stream_base.o \ + network/uthread_runtime.o \ + network/uthread_epoll.o \ + network/socket_stream_block.o \ + network/socket_stream_uthread.o \ + network/uthread_context_util.o \ + network/uthread_context_base.o \ + network/uthread_context_system.o \ network/timer.o LIB_FILE_OBJS = file/log_utils.o file/file_utils.o file/opt_map.o file/config.o -LIB_RPC_OBJS = rpc/phxrpc.pb.o rpc/caller.o \ - rpc/server_config.o rpc/client_config.o rpc/socket_stream_phxrpc.o \ - rpc/uthread_caller.o rpc/client_monitor.o rpc/server_monitor.o \ - rpc/monitor_factory.o rpc/hsha_server.o rpc/server_base.o +LIB_RPC_OBJS = rpc/phxrpc.pb.o \ + rpc/caller.o \ + rpc/server_config.o \ + rpc/client_config.o \ + rpc/socket_stream_phxrpc.o \ + rpc/uthread_caller.o \ + rpc/client_monitor.o \ + rpc/server_monitor.o \ + rpc/monitor_factory.o \ + rpc/hsha_server.o \ + rpc/server_base.o LIB_MSG_OBJS = msg/base_msg.o msg/base_msg_handler.o msg/base_msg_handler_factory.o @@ -26,8 +40,12 @@ ifeq ($(OS),Darwin) LIB_NETWORK_OBJS += ../plugin_darwin/network/epoll-darwin.o endif -LIB_OBJS = $(LIB_RPC_OBJS) $(LIB_MSG_OBJS) $(LIB_HTTP_OBJS) \ - $(LIB_NETWORK_OBJS) $(LIB_FILE_OBJS) $(LIB_COMM_OBJS) +LIB_OBJS = $(LIB_RPC_OBJS) \ + $(LIB_MSG_OBJS) \ + $(LIB_HTTP_OBJS) \ + $(LIB_NETWORK_OBJS) \ + $(LIB_FILE_OBJS) \ + $(LIB_COMM_OBJS) TARGETS = libphxrpc.a