From e1e97f1f98baf82efcd5825d7c7a7b4b1b2f2e40 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期一, 13 七月 2020 19:03:21 +0800 Subject: [PATCH] udpate --- test/Makefile | 56 +++++++++++++++++++++----------------------------------- 1 files changed, 21 insertions(+), 35 deletions(-) diff --git a/test/Makefile b/test/Makefile index f20ab24..4b17f01 100755 --- a/test/Makefile +++ b/test/Makefile @@ -1,53 +1,39 @@ +# +# Makefile for common library. +# 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 +#LDLIBS+=-Wl,-rpath=$(ROOT)/common:$(ROOT)/lib/jsoncpp +# 寮�婧愬伐鍏峰寘璺緞 +LDDIR += -L$(ROOT)/queue +# 寮�婧愬伐鍏峰寘 +LDLIBS += -lshm_queue -lpthread + +INCLUDE += -I$(ROOT)/queue/ -I$(ROOT)/queue/include + PLATFORM=$(shell $(ROOT)/systype.sh) include $(ROOT)/Make.defines.$(PLATFORM) + +PROGS = test_queue single_productor single_consumer multiple_queue_productor multiple_queue_consumer test_timeout test_lostdata -PROGS = test_queue productor consumer single_productor single_consumer - - - -all: $(PROGS) +build: $(PROGS) # test1: $(LIBCOMMON) # 濡傛灉鍖匒 寮曠敤鍖匓锛� B 瑕佹斁鍦� A 鍚庨潰 -# svshm_reader: binary_sems.c $(LIBSQUEUE) $(LIBCOMMON) + -# svshm_writer: binary_sems.c $(LIBSQUEUE) $(LIBCOMMON) +test_queue: test.h $(ROOT)/queue/include/lock_free_queue.h -test_queue: test.h $(ROOT)/squeue/include/SArrayLockFreeQueue.h $(ROOT)/squeue/include/SLinkedLockFreeQueue.h $(ROOT)/squeue/include/QFactory.h $(LIBSQUEUE) $(LIBCOMMON) +single_productor: test.h $(ROOT)/queue/include/lock_free_queue.h - -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) +single_consumer: test.h $(ROOT)/queue/include/lock_free_queue.h clean: - rm -f $(PROGS) $(TEMPFILES) *.o + rm -f $(TEMPFILES) $(PROGS) -$(LIBCOMMON): - (cd $(ROOT)/common && $(MAKE)) -$(LIBSQUEUE): - (cd $(ROOT)/squeue && $(MAKE)) +$(LIBQUEUE): + (cd $(ROOT)/queue && $(MAKE)) -- Gitblit v1.8.0