From 2b43ef443f14889e086bdf0ccb28e66d17efd2ae Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期二, 22 十二月 2020 12:01:13 +0800 Subject: [PATCH] update --- demo/Makefile | 47 ++++++++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 17 deletions(-) diff --git a/demo/Makefile b/demo/Makefile index f7c6491..9e1429f 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -1,27 +1,40 @@ -# -# Makefile for common library. -# -ROOT=.. -LDLIBS+=-Wl,-rpath=$(ROOT)/lib:$(ROOT)/build/lib -# 寮�婧愬伐鍏峰寘璺緞 -LDDIR += -L$(ROOT)/build/lib -# 寮�婧愬伐鍏峰寘 -LDLIBS += -lshm_queue -lusgcommon -lpthread + -INCLUDE += -I$(ROOT)/build/include - +ROOT := .. PLATFORM=$(shell $(ROOT)/systype.sh) include $(ROOT)/Make.defines.$(PLATFORM) +#RPATH += -Wl,-rpath=${ROOT}/lib +# 寮�婧愬伐鍏峰寘璺緞 +LDDIR += -L${DEST}/lib -PROGS = req_rep pub_sub queue +# 寮�婧愬伐鍏峰寘 +LDLIBS += -lshm_queue -lusgcommon -lpthread + +INCLUDES += -I${DEST}/include/shmqueue -I$(ROOT)/include/usgcommon -build: $(PROGS) +PROGS = ${DEST}/dgram_mod_req_rep ${DEST}/dgram_mod_survey ${DEST}/dgram_mod_bus -# test1: $(LIBCOMMON) +DEPENDENCES = $(patsubst %, %.d, $(PROGS)) -# 濡傛灉鍖匒 寮曠敤鍖匓锛� B 瑕佹斁鍦� A 鍚庨潰 - +#LIBCOMMON=${ROOT}/lib/libusgcommon.a + +build: $(PROGS) + + +# 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 + + + -- Gitblit v1.8.0