From 24641678c68b5eadafa49c9341c7fcbfcff28262 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 18 一月 2021 11:19:44 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
test_net_socket/Makefile | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/test_net_socket/Makefile b/test_net_socket/Makefile
index 56d3c29..94734be 100644
--- a/test_net_socket/Makefile
+++ b/test_net_socket/Makefile
@@ -3,27 +3,26 @@
PLATFORM=$(shell $(ROOT)/systype.sh)
include $(ROOT)/Make.defines.$(PLATFORM)
-#RPATH += -Wl,-rpath=${ROOT}/lib
+RPATH += -Wl,-rpath=$(ROOT)/lib:$(DEST)/lib
# 寮�婧愬伐鍏峰寘璺緞
-LDDIR += -L${DEST}/lib
+LDDIR += -L$(DEST)/lib
+#-lusgcommon
# 寮�婧愬伐鍏峰寘
-LDLIBS += -lshm_queue -lusgcommon -lpthread
+LDLIBS += -lshm_queue -lpthread -lusgcommon
-INCLUDES += -I${DEST}/include/shmqueue -I$(ROOT)/include/usgcommon
+#-I$(ROOT)/include/usgcommon
+INCLUDES += -I${ROOT}/src -I${ROOT}/src/shm -I${ROOT}/src/queue -I${ROOT}/src/socket -I${ROOT}/include/usgcommon
-
-PROGS = ${DEST}/net_mod_req_rep
+PROGS = ${DEST}/test_net_mod_socket ${DEST}/test_bus_stop ${DEST}/heart_beat
DEPENDENCES = $(patsubst %, %.d, $(PROGS))
#LIBCOMMON=${ROOT}/lib/libusgcommon.a
-build: $(PROGS)
- cp -a net_mod_req_rep.sh ${DEST}
-
-# class
-#$(DEST)/kucker : kucker.c
+build: $(PROGS)
+ cp -a net_mod_socket.sh ${DEST}
+ cp -a heart_beat.sh ${DEST}
clean:
--
Gitblit v1.8.0