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 | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/test/Makefile b/test/Makefile index fdcff9a..4bcb663 100755 --- a/test/Makefile +++ b/test/Makefile @@ -2,38 +2,25 @@ # Makefile for common library. # ROOT=.. -#LDLIBS+=-Wl,-rpath=$(ROOT)/common:$(ROOT)/lib/jsoncpp +LDLIBS+=-Wl,-rpath=$(ROOT)/lib:$(ROOT)/build/lib # 寮�婧愬伐鍏峰寘璺緞 -LDDIR += -L$(ROOT)/squeue +LDDIR += -L$(ROOT)/lib -L$(ROOT)/build/lib # 寮�婧愬伐鍏峰寘 -LDLIBS += -lsqueue -lpthread +LDLIBS += -lshm_queue -lusgcommon -lpthread -INCLUDE += -I$(ROOT)/squeue/ -I$(ROOT)/squeue/include +INCLUDE += -I$(ROOT)/build/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 - +PROGS = protocle_parse strtok test_set test_vector build: $(PROGS) # test1: $(LIBCOMMON) # 濡傛灉鍖匒 寮曠敤鍖匓锛� B 瑕佹斁鍦� A 鍚庨潰 - - -test_queue: test.h $(ROOT)/squeue/include/lock_free_queue.h - -single_productor: test.h $(ROOT)/squeue/include/lock_free_queue.h - -single_consumer: test.h $(ROOT)/squeue/include/lock_free_queue.h clean: rm -f $(TEMPFILES) $(PROGS) - - - -$(LIBSQUEUE): - (cd $(ROOT)/squeue && $(MAKE)) -- Gitblit v1.8.0