From 03987ef3d1ed9c2d604561a69db169cd535014b6 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期六, 25 七月 2020 16:17:04 +0800 Subject: [PATCH] commit --- test/Makefile | 57 +++++++++++++++------------------------------------------ 1 files changed, 15 insertions(+), 42 deletions(-) diff --git a/test/Makefile b/test/Makefile index f20ab24..4bcb663 100755 --- a/test/Makefile +++ b/test/Makefile @@ -1,53 +1,26 @@ +# +# 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)/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 -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)/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 - - -$(LIBCOMMON): - (cd $(ROOT)/common && $(MAKE)) - -$(LIBSQUEUE): - (cd $(ROOT)/squeue && $(MAKE)) + rm -f $(TEMPFILES) $(PROGS) -- Gitblit v1.8.0