From 82bd40bc2b2d024ab7be0f27eea3f871f99cc213 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 21 十月 2020 16:55:30 +0800
Subject: [PATCH] update

---
 test_socket/Makefile |   46 +++++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/test_socket/Makefile b/test_socket/Makefile
index f3d0ac8..22a401f 100644
--- a/test_socket/Makefile
+++ b/test_socket/Makefile
@@ -1,28 +1,40 @@
-#
-# Makefile for common library.
-#
-ROOT=..
-LDLIBS+=-Wl,-rpath=$(ROOT)/lib:$(ROOT)/build/lib
-# 寮�婧愬伐鍏峰寘璺緞
-LDDIR += -L$(ROOT)/build/lib
-# 寮�婧愬伐鍏峰寘
-LDLIBS += -lshm_queue -lusgcommon -lpthread
 
-INCLUDE += -I$(ROOT)/build/include
-
+ROOT := ..
 PLATFORM=$(shell $(ROOT)/systype.sh)
 include $(ROOT)/Make.defines.$(PLATFORM)
 
+#RPATH += -Wl,-rpath=${ROOT}/lib
+# 寮�婧愬伐鍏峰寘璺緞
+LDDIR += -L${DEST}/lib
 
-PROGS =	dgram_socket_test dgram_mod_req_rep dgram_mod_survey stream_mod_req_rep
+# 寮�婧愬伐鍏峰寘
+#-lusgcommon
+LDLIBS += -lshm_queue  -lpthread
+
+INCLUDES += -I${ROOT}/src -I${ROOT}/src/queue -I${ROOT}/src/socket -I${ROOT}/src/common/include 
 
 
-build: $(PROGS)
+PROGS = ${DEST}/dgram_mod_bus ${DEST}/dgram_mod_survey ${DEST}/dgram_mod_req_rep ${DEST}/test_timeout ${DEST}/test_open_close
 
-# test1: $(LIBCOMMON)
+DEPENDENCES = $(patsubst %, %.d, $(PROGS)) 
 
-# 濡傛灉鍖匒 寮曠敤鍖匓锛� B 瑕佹斁鍦� A 鍚庨潰
-  
+#LIBCOMMON=${ROOT}/lib/libusgcommon.a
+
+build:	 $(PROGS)
+
+
+# class
+#$(DEST)/kucker : kucker.c
+
+
 clean:
-	rm -f $(TEMPFILES) $(PROGS)
+	rm -f $(PROGS) $(DEPENDENCES) $(TEMPFILES)
+
+# $(LIBCOMMON):
+# 	@(cd $(ROOT)/common && $(MAKE))
+
+-include $(DEPENDENCES)
+include $(ROOT)/Make.common.inc
+
+
 

--
Gitblit v1.8.0