From caecfd9123e17b916c1e6e79f967afb3cdeaa0bb Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 01 十二月 2020 09:51:00 +0800
Subject: [PATCH] sendandrev reentry
---
test/Makefile | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/test/Makefile b/test/Makefile
index fdcff9a..7046699 100755
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,39 +1,39 @@
-#
-# 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 single_productor single_consumer multiple_queue_productor multiple_queue_consumer test_timeout
+#RPATH += -Wl,-rpath=${ROOT}/lib
+# 寮�婧愬伐鍏峰寘璺緞
+LDDIR += -L${DEST}/lib
+
+# 寮�婧愬伐鍏峰寘
+LDLIBS += -lshm_queue -lusgcommon -lpthread
+
+INCLUDES += -I${DEST}/include/shmqueue -I$(ROOT)/include/usgcommon
-build: $(PROGS)
+PROGS = ${DEST}/test test2
-# test1: $(LIBCOMMON)
+DEPENDENCES = $(patsubst %, %.d, $(PROGS))
-# 濡傛灉鍖匒 寮曠敤鍖匓锛� B 瑕佹斁鍦� A 鍚庨潰
-
+#LIBCOMMON=${ROOT}/lib/libusgcommon.a
-test_queue: test.h $(ROOT)/squeue/include/lock_free_queue.h
+build: $(PROGS)
-single_productor: test.h $(ROOT)/squeue/include/lock_free_queue.h
-single_consumer: test.h $(ROOT)/squeue/include/lock_free_queue.h
+# class
+#$(DEST)/kucker : kucker.c
+
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