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/Makefile | 106 +++++++++++-----------------------------------------
1 files changed, 23 insertions(+), 83 deletions(-)
diff --git a/test/Makefile b/test/Makefile
index 69a2668..c490f5e 100755
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,97 +1,37 @@
-# ROOT=..
-# EXTRALIBS+=
-# INCLUDE+=-I. -I$(ROOT)/squeue/include -I$(ROOT)/squeue -I$(ROOT)/common/include
-# LIBCOMMON=$(ROOT)/common/libusgcommon.a
-# LIBSQUEUE=$(ROOT)/squeue/libsqueue.a
-# LDLIBS = -lpthread
-# PLATFORM=$(shell $(ROOT)/systype.sh)
-# include $(ROOT)/Make.defines.$(PLATFORM)
-
-# PROGS = test_queue productor consumer single_productor single_consumer
-
-
-
-
-# all: $(PROGS)
-
-# # test1: $(LIBCOMMON)
-
-# # 濡傛灉鍖匒 寮曠敤鍖匓锛� B 瑕佹斁鍦� A 鍚庨潰
-# # svshm_reader: binary_sems.c $(LIBSQUEUE) $(LIBCOMMON)
-
-# # svshm_writer: binary_sems.c $(LIBSQUEUE) $(LIBCOMMON)
-
-# test_queue: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h $(LIBSQUEUE) $(LIBCOMMON)
-
-
-# productor: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h $(LIBSQUEUE) $(LIBCOMMON)
-
-
-# consumer: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h $(LIBSQUEUE) $(LIBCOMMON)
-
-
-# single_productor: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h $(LIBSQUEUE) $(LIBCOMMON)
-
-# single_consumer: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h $(LIBSQUEUE) $(LIBCOMMON)
-# # test_lostdata: test.h $(LIBSQUEUE) $(LIBCOMMON)
-
-# # consumer_timeout: $(ROOT)/squeue/include/squeue.h test.h $(LIBSQUEUE) $(LIBCOMMON)
-
-# # productor_timeout: $(ROOT)/squeue/squeue.h $(LIBSQUEUE) $(LIBCOMMON)
-
-# # test_atomic: $(ROOT)/squeue/squeue.h $(LIBSQUEUE) $(LIBCOMMON)
-
-# clean:
-# rm -f $(PROGS) $(TEMPFILES) *.o
-
-
-
-#
-# Makefile for common library.
-#
-ROOT=..
-#LDLIBS+=-Wl,-rpath=$(ROOT)/common:$(ROOT)/lib/jsoncpp
-# 寮�婧愬伐鍏峰寘璺緞
-LDDIR += -L$(ROOT)/squeue
-# 寮�婧愬伐鍏峰寘
-LDLIBS += -lsqueue -lpthread
-
-INCLUDE += -I$(ROOT)/squeue/ -I$(ROOT)/squeue/include
-
+ROOT := ..
PLATFORM=$(shell $(ROOT)/systype.sh)
include $(ROOT)/Make.defines.$(PLATFORM)
-
-PROGS = test_queue
+RPATH += -Wl,-rpath=$(ROOT)/lib:$(DEST)/lib
+# 寮�婧愬伐鍏峰寘璺緞
+LDDIR += -L$(DEST)/lib
+#-lusgcommon
+# 寮�婧愬伐鍏峰寘
+LDLIBS += -lshm_queue -lpthread -lusgcommon
+
+#-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_sem
+
+DEPENDENCES = $(patsubst %, %.d, $(PROGS))
+
+#LIBCOMMON=${ROOT}/lib/libusgcommon.a
build: $(PROGS)
-
-
-
-# test1: $(LIBCOMMON)
-
-# 濡傛灉鍖匒 寮曠敤鍖匓锛� B 瑕佹斁鍦� A 鍚庨潰
-test_queue: test.h $(ROOT)/squeue/include/lock_free_queue.h
-
-
-productor: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h
-
-
-consumer: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h
-
-
-single_productor: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h
-
-single_consumer: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h
clean:
- rm -f $(TEMPFILES) $(PROGS)
+ rm -f $(PROGS) $(DEPENDENCES) $(TEMPFILES)
+
+# $(LIBCOMMON):
+# @(cd $(ROOT)/common && $(MAKE))
+
+-include $(DEPENDENCES)
+include $(ROOT)/Make.common.inc
-$(LIBSQUEUE):
- (cd $(ROOT)/squeue && $(MAKE))
--
Gitblit v1.8.0