Merge branch 'master' into dev

wangzhengquan

2021-01-18 24641678c68b5eadafa49c9341c7fcbfcff28262

 test/Makefile

@@ -1,90 +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
# PLATFORM=$(shell $(ROOT)/systype.sh)
# include $(ROOT)/Make.defines.$(PLATFORM)


# PROGS =   test_queue productor consumer single_productor single_consumer
	     

	

# all: $(PROGS) 

# # test1: $(LIBCOMMON)

# # 如果包A 引用包B， 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



#
# 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:$(DEST)/lib
# 开源工具包路径
LDDIR += -L$(DEST)/lib

#-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

PROGS = ${DEST}/test_sem

DEPENDENCES = $(patsubst %, %.d, $(PROGS)) 

#LIBCOMMON=${ROOT}/lib/libusgcommon.a

build: $(PROGS)

	

# test1: $(LIBCOMMON)

# 如果包A 引用包B， 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)
   rm -f $(PROGS) $(DEPENDENCES) $(TEMPFILES)

# $(LIBCOMMON):
#    @(cd $(ROOT)/common && $(MAKE))

-include $(DEPENDENCES)
include $(ROOT)/Make.common.inc



$(LIBSQUEUE):
   (cd $(ROOT)/squeue && $(MAKE))