From 7e1e05df84d57d2d7c3a622d0ece0d4fe7b1fc8c Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 22 一月 2021 18:03:13 +0800
Subject: [PATCH] update
---
test/Makefile | 60 ++++++++++++++++++++++--------------------------------------
1 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/test/Makefile b/test/Makefile
index f20ab24..c490f5e 100755
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,53 +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
+
+ROOT := ..
PLATFORM=$(shell $(ROOT)/systype.sh)
include $(ROOT)/Make.defines.$(PLATFORM)
+RPATH += -Wl,-rpath=$(ROOT)/lib:$(DEST)/lib
+# 寮�婧愬伐鍏峰寘璺緞
+LDDIR += -L$(DEST)/lib
-PROGS = test_queue productor consumer single_productor single_consumer
-
+#-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
-all: $(PROGS)
+PROGS = ${DEST}/test_sem
-# test1: $(LIBCOMMON)
+DEPENDENCES = $(patsubst %, %.d, $(PROGS))
-# 濡傛灉鍖匒 寮曠敤鍖匓锛� B 瑕佹斁鍦� A 鍚庨潰
-# svshm_reader: binary_sems.c $(LIBSQUEUE) $(LIBCOMMON)
+#LIBCOMMON=${ROOT}/lib/libusgcommon.a
-# svshm_writer: binary_sems.c $(LIBSQUEUE) $(LIBCOMMON)
+build: $(PROGS)
+
-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
+ rm -f $(PROGS) $(DEPENDENCES) $(TEMPFILES)
+
+# $(LIBCOMMON):
+# @(cd $(ROOT)/common && $(MAKE))
+
+-include $(DEPENDENCES)
+include $(ROOT)/Make.common.inc
-$(LIBCOMMON):
- (cd $(ROOT)/common && $(MAKE))
-$(LIBSQUEUE):
- (cd $(ROOT)/squeue && $(MAKE))
--
Gitblit v1.8.0