From baa6fb17d950c4f5684f5d798f90595456723418 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 16:16:46 +0800
Subject: [PATCH] conflict

---
 test/Makefile |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/test/Makefile b/test/Makefile
new file mode 100755
index 0000000..ffc7b16
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,26 @@
+#
+# Makefile for common library.
+#
+ROOT=..
+LDLIBS+=-Wl,-rpath=$(ROOT)/lib:$(ROOT)/build/lib
+# 寮�婧愬伐鍏峰寘璺緞
+LDDIR +=  -L$(ROOT)/lib -L$(ROOT)/build/lib
+# 寮�婧愬伐鍏峰寘
+LDLIBS += -lshm_queue -lusgcommon -lpthread
+
+INCLUDE += -I$(ROOT)/build/include
+
+PLATFORM=$(shell $(ROOT)/systype.sh)
+include $(ROOT)/Make.defines.$(PLATFORM)
+
+ 
+PROGS = protocle_parse strtok test_set test_vector lambda test
+
+build: $(PROGS)
+
+# test1: $(LIBCOMMON)
+
+# 濡傛灉鍖匒 寮曠敤鍖匓锛� B 瑕佹斁鍦� A 鍚庨潰
+
+clean:
+	rm -f $(TEMPFILES) $(PROGS)

--
Gitblit v1.8.0