From 71c847e99c0ce99fae955b08c0aafecb0fb9bdd6 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 18 一月 2021 11:55:33 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
test_net_socket/Makefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/test_net_socket/Makefile b/test_net_socket/Makefile
index 832a130..94734be 100644
--- a/test_net_socket/Makefile
+++ b/test_net_socket/Makefile
@@ -12,7 +12,7 @@
LDLIBS += -lshm_queue -lpthread -lusgcommon
#-I$(ROOT)/include/usgcommon
-INCLUDES += -I${ROOT}/src -I${ROOT}/src/queue -I${ROOT}/src/socket -I${ROOT}/src/common/include -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}/test_net_mod_socket ${DEST}/test_bus_stop ${DEST}/heart_beat
@@ -22,6 +22,7 @@
build: $(PROGS)
cp -a net_mod_socket.sh ${DEST}
+ cp -a heart_beat.sh ${DEST}
clean:
--
Gitblit v1.8.0