From 5ee8bed99c17724c18993c1f93f619e608dfbe3e Mon Sep 17 00:00:00 2001 From: zhangsz Date: Tue, 4 Mar 2025 11:29:37 +0800 Subject: [PATCH] fix: makefile renew --- .gitignore | 3 + include/Makefile.backup | 58 ++++ include/Makefile.cov | 101 +++++++ include/Makefile.doxygen | 28 ++ include/Makefile.indent | 379 +++++++++++++++++++++++++++ include/Makefile.rules | 350 +++++++++++++++++++++++++ include/Makefile.splint | 288 ++++++++++++++++++++ include/Makefile.usage | 36 +++ mss/Makefile | 15 ++ mss/main/Makefile | 9 +- plat/Makefile | 30 +++ plat/debug/Makefile | 3 +- plat/iptrans/Makefile | 3 +- plat/m2ua/Makefile | 3 +- plat/mtp3/Makefile | 3 +- plat/public/Makefile | 3 +- plat/public/ut/main/Makefile | 3 +- plat/public/ut/timer/Makefile | 3 +- plat/radius/Makefile | 3 +- plat/radius/src/include/radius_pub.h | 2 + plat/radius/ut/Makefile | 3 +- plat/sccp/Makefile | 3 +- plat/sccp/ut/fsmtest/Makefile | 3 +- plat/scf/Makefile | 3 +- plat/smpp/Makefile | 3 +- plat/snmp/Makefile | 3 +- plat/tcap/Makefile | 3 +- plat/tcp/Makefile | 3 +- plat/xapp/Makefile | 3 +- 29 files changed, 1328 insertions(+), 22 deletions(-) create mode 100644 include/Makefile.backup create mode 100644 include/Makefile.cov create mode 100644 include/Makefile.doxygen create mode 100644 include/Makefile.indent create mode 100644 include/Makefile.rules create mode 100644 include/Makefile.splint create mode 100644 include/Makefile.usage create mode 100644 mss/Makefile create mode 100644 plat/Makefile diff --git a/.gitignore b/.gitignore index 7e4a68f..9f1dd49 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,6 @@ dkms.conf # Go workspace file go.work +# directory +bin +tmp \ No newline at end of file diff --git a/include/Makefile.backup b/include/Makefile.backup new file mode 100644 index 0000000..d0f07c4 --- /dev/null +++ b/include/Makefile.backup @@ -0,0 +1,58 @@ + +##----------------------------------------------------------## +## ## +## Universal Makefile Backup Function ## +## ## +## Created : Wei Liu 07/06/20 ## +## Revision: [Last]Wei Liu 07/07/07 ## +## ## +##----------------------------------------------------------## + + +##-------------------------------------- +## +## Make backup +## +##-------------------------------------- +# backup +TIME_STR = ${shell date +%y%m%d_%H%M%S} +VER_STR = $(sed -n '/$(MODULE)_VERSION/'p ./src/include/$(MODULE).h | \ + awk -F '[{,}]' $(print $2 $3 $4 ) ) +BACK_PATH := ../../../r9_bak +BACK_PATH := $(BACK_PATH)/$(TYPE)/$(MODULE) +BACK_NAME = $(MODULE)_$(VER_STR)_$(TIME_STR).tgz +LS = ls -tl + +version: + @echo $(VER_STR) + +backfile ?= * + +ifeq "$(backfile)" "*" + backfile =$(wildcard $(BACK_PATH)/*.tgz) + CHECK_BACK_FILE =$(backfile) +else + CHECK_BACK_FILE =$(shell find $(BACK_PATH) -name $(backfile)) +endif + +bk: clean + @$(MKDIR) -p $(BACK_PATH) --mode=0777 + @echo Backuping $(MODULE)... $(BACK_PATH)/$(BACK_NAME) + @tar czvf $(BACK_PATH)/$(BACK_NAME) ./src ./ut ./doc ./Makefile + +lsbk: + @$(LS) $(BACK_PATH) + +rmbk: +ifneq "$(CHECK_BACK_FILE)" "" + @rm -rf $(BACK_PATH)/$(backfile) + @$(LS) $(BACK_PATH) +endif + +unzip: +ifneq "$(CHECK_BACK_FILE)" "" + @tar czvf $(BACK_PATH)/$(BACK_NAME) ./src ./ut ./doc ./Makefile + @tar zxvf $(BACK_PATH)/$(backfile) + @ls $(BACK_PATH) +endif + diff --git a/include/Makefile.cov b/include/Makefile.cov new file mode 100644 index 0000000..278a959 --- /dev/null +++ b/include/Makefile.cov @@ -0,0 +1,101 @@ + +##----------------------------------------------------------## +## ## +## Universal Makefile Lcov Function ## +## ## +## Created : Wei Liu 07/04/11 ## +## Revision: [Last]Wei Liu 07/07/09 ## +## ## +##----------------------------------------------------------## + +##-------------------------------------- +## +## COVER define +## +##-------------------------------------- + +ifeq "$(COVER_NEED)" "yes" + +COVER := /usr/bin/lcov +GENHTML := /usr/bin/genhtml +GENDESC := /usr/bin/gendesc +GENPNG := /usr/bin/genpng + +##Depending on the presence of the GD.pm perl module, we can use the +##special option '--frames' for genhtml +USE_GENPNG := $(shell $(GENPNG) --help >/dev/null 2>/dev/null; echo $$?) + +ifeq ($(USE_GENPNG),0) + FRAMES := --frames +else + FRAMES := +endif + +##COV_SETFLAG := --zerocounters --path . -q --directory . +COV_SETFLAG := --zerocounters -q --directory ../obj +COV_SET := $(COVER) $(COV_SETFLAG) + +COVER_REPORT_PATH ?= $(UTDIR)/output + +INFO_FILE = $(COVER_REPORT_PATH)/$(MODULE).info +DSP_FILE = $(MODULE)_test_descriptions.txt + +COV_OUTSET = --capture --directory ../obj \ + --output-file $(INFO_FILE)\ + --test-name $(MODULE) -q \ + --base-directory ../ + +COV_HTMLSET= $(INFO_FILE) \ + --output-directory $(COVER_REPORT_PATH)\ + --title $(MODULE) \ + --show-details $(FRAMES) \ + --legend -q --num-spaces 4 +COV_OUTPUT = $(COVER) $(COV_OUTSET) + + +COV_DOC_PATH := /usr/local/include/cov + +endif + +##-------------------------------------- +## +## Make Test +## +##-------------------------------------- + +test: + @echo -e "\n================================Test start======================================\n" +ifeq "$(BUILD)" "exef" +ifeq "$(COVER_NEED)" "yes" + @$(MKDIR) -p $(COVER_REPORT_PATH) --mode=0777 + @cp -rf $(COV_DOC_PATH)/lcovrc $(COV_DOC_PATH)/lcov_html_header\ + $(COV_DOC_PATH)/lcov_html_foot /etc/ + @cp -rf /usr/local/include/cgprof/cgprof /usr/local/bin/cgprof + @$(COV_SET) + $(OUTFILE) + gprof $(OUTFILE) gmon.out -p | cgprof -Tps + @$(COV_OUTPUT) + @LANG=C $(GENHTML) $(COV_HTMLSET) + @echo + @echo -e "||---------------------------------------------------------------" + @echo -e "|| Test cover report generated on the paht $(COVER_REPORT_PATH). " + @echo -e "|| Point a web browser at index.html to see results. " + @echo -e "||---------------------------------------------------------------" +else + @echo "COVER_NEED: $(COVER_NEED)BUILD: $(BUILD) " + $(OUTFILE) +endif + @echo -e "\n================================Test End========================================\n" +else + @echo -e "||---------------------------------------------------------------" + @echo -e "|| This is not exef project! " + @echo -e "||---------------------------------------------------------------" + @echo "This is not exef project!" +endif + +cleanlcov: + @$(COV_SET) --reset + +retest: cleanlcov test + + diff --git a/include/Makefile.doxygen b/include/Makefile.doxygen new file mode 100644 index 0000000..7c4dd55 --- /dev/null +++ b/include/Makefile.doxygen @@ -0,0 +1,28 @@ + +##----------------------------------------------------------## +## ## +## Universal Makefile Documentation Function ## +## ## +## Created : Wei Liu 07/06/30 ## +## Revision: [Last]Wei Liu 07/07/07 ## +## ## +##----------------------------------------------------------## + +VER_STR ?= 9.0 +DOXYGEN_DOC_PATH := /usr/local/include/doc + + +define PREPARE_DOXYGEN +sed 's/MODULE/$(MODULE)/g' $(1) | sed 's/VER_STR/$(VER_STR)/g' >> ./doc/doxygen.conf +endef + +define MAKE_DOC +@echo +@echo -e "Generate documnet of $(MODULE)\t\t\t Please Waiting..." +@$(call PREPARE_DOXYGEN, $(DOXYGEN_DOC_PATH)/doxygen.conf) +@doxygen ./doc/doxygen.conf +@cp -rf $(DOXYGEN_DOC_PATH)/view_chm.bat ./doc/html +@echo +@echo ==================================Doxygen End=================================== +endef + diff --git a/include/Makefile.indent b/include/Makefile.indent new file mode 100644 index 0000000..adf0a6a --- /dev/null +++ b/include/Makefile.indent @@ -0,0 +1,379 @@ + +##----------------------------------------------------------## +## ## +## Universal Makefile Indenting fuction ## +## ## +## Created : Wei Liu 07/04/30 ## +## Revision: [Last]Wei Liu 07/07/07 ## +## ## +##----------------------------------------------------------## + +##-------------------------------------- +## +## Make indenting program flags +## +##-------------------------------------- + +##-bad或--blank-lines-after-declarations 　在声明区段后加上空白行。 +BAD_FLAG := +##-bad + +##-bap或--blank-lines-after-procedures 　在程序后加上空白行。 +BAP_FLAG := +##-bap + +##-bbb或--blank-lines-after-block-comments 　在注释区段後加上空白行。 +BBB_FLAG := +##-bbb + +##--break-before-boolean-operator bbo 较长的行，在逻辑运算符前分行 +BBO_FLAG := + +##-bc或--blank-lines-after-commas 　在声明区段中，若出现逗号即换行。 +BC_FLAG := + +##-bl或--braces-after-if-line 　if(或是else,for等等)与後面执行区段的"{"自成一行。 +BL_FLAG := -bl + +##-bli<缩排格数>或--brace-indent<缩排格数> 　设置{}缩排的格数。 +BLI_FLAG := -bli4 + +##--braces-after-struct-decl-line bls 定义结构，"struct"和"{"分行 +BLS_FLAG := -bls + +##-br或--braces-on-if-line 　if(或是else,for等等)与後面执行跛段的"{"自成一行。 +BR_FLAG := + +##-bs或--blank-before-sizeof 　在sizeof之後空一格。 +BS_FLAG := + +##`-cbin' +##`--case-brace-indentationn' +##Indent braces after a case label N spaces. +CBI_FLAG := -cbi5 + +##-c<栏数>或--comment-indentation<栏数> 　将注释置于程序码右侧指定的栏位。 +CW_FLAG := -c33 + +##-cd<栏数>或--declaration-comment-column<栏数> 　将注释置于声明右侧指定的栏位。 +CD_FLAG := -cd33 + +##-cdb或--comment-delimiters-on-blank-lines 　注释符号自成一行。 +CDB_FLAG := + +##-ce或--cuddle-else 　将else置于"}"(if执行区段的结尾)之後。 +CE_FLAG := + +##-ci<缩排格数>或--continuation-indentation<缩排格数> 　叙述过长而换行时，指定换行後缩排的格数。 +CI_FLAG := +##-ci4 + +##-cli<缩排格数>或--case-indentation-<缩排格数> 　使用case时，switch缩排的格数。 +CLI_FLAG := -cli0 + +##-cp<栏数>或-else-endif-column<栏数> 　将注释置于else与elseif叙述右侧定的栏位。 +CP_FLAG := -cp33 + +##-cs或--space-after-cast 　在cast之後空一格。 +CS_FLAG := -cs + +##-d<缩排格数>或-line-comments-indentation<缩排格数> 　针对不是放在程序码右侧的注释，设置其缩排格数。 +D_FLAG := +##-d0 + +##-di<栏数>或--declaration-indentation<栏数> 　将声明区段的变量置于指定的栏位。 +DI_FLAG := +##-di4 + +##-fc1或--format-first-column-comments 　针对放在每行最前端的注释，设置其格式。 +FC1_FLAG := -fc1 + + +##-fca或--format-all-comments 　设置所有注释的格式。 +FCA_FLAG := + +##-gnu或--gnu-style 　指定使用GNU的格式，此为预设值。 +GNU_FLAG := + +##-kr或--k-and-r-style 　指定使用Kernighan&Ritchie的格式。 +KR_FLAG := + +##-orig或--original 　使用Berkeley的格式。 +ORG_STYLE := + +##-i<格数>或--indent-level<格数> 　设置缩排的格数。 +I_FLAG := -i4 + +##-ip<格数>或--parameter-indentation<格数> 　设置参数的缩排格数。 +IP_FLAG := -ip4 + +##--line-length 75 l75 非注释行最长75 +LINE_FLAG := + +##`-lcn' +##`--comment-line-lengthn' +##Set maximum line length for comment formatting to n. +LCN_FLAG := + +##`-lps' +##`--leave-preprocessor-space' +##Leave space between `#' and preprocessor directive. +LPS_FLAG := + +##-lp或--continue-at-parentheses 　叙述过长而换行，且叙述中包含了括号时，将括号中的每行起始栏位内容垂直对其排列。 +LP_FLAG := + +##--break-function-decl-args nbfda 关闭：函数的参数一个一行 +NBFDA_FLAG := -nbfda + +##-nbad或--no-blank-lines-after-declarations 　在声明区段後不要加上空白行。 +NBAD_FLAG := + +##-nbap或--no-blank-lines-after-procedures 　在程序後不要加上空白行。 +NBAP_FLAG := + +##-nbbb或--no-blank-lines-after-block-comments 　在注释区段後不要加上空白行。 +NBBB_FLAG := + +##-nbc或--no-blank-lines-after-commas 　在声明区段中，即使出现逗号，仍旧不要换行。 +NBC_FLAG := -nbc + +##-ncdb或--no-comment-delimiters-on-blank-lines 　注释符号不要自成一行。 +NCBD_FLAG := -ncdb + +##--cuddle-do-while ncdw "do --- while"的"while"和其前面的"}"另起一行 +NCDW_FLAG := -ncdw + +##-nce或--dont-cuddle-else 　不要将else置于"}"之後。 +NCE_FLAG := +##-nce + +##-ncs或--no-space-after-casts 　不要在cast之後空一格。 +NCS_FLAG := + +##-nfc1或--dont-format-first-column-comments 　不要格式化放在每行最前端的注释。 +NFC1_FLAG := + +##-nfca或--dont-format-comments 　不要格式化任何的注释。 +NFCA_FLAG := -nfca + +##--honour-newlines hnl Prefer to break long lines at the position of newlines in the input +HNL_FLAG := -hnl + +##-nip或--no-parameter-indentation 　参数不要缩排。 +NIP_FLAG := + +##-nlp或--dont-line-up-parentheses 　叙述过长而换行，且叙述中包含了括号时，不用将括号中的每行起始栏位垂直对其排列。 +NLP_FLAG := + +##-npcs或--no-space-after-function-call-names 　在调用的函数名称之後，不要加上空格。 +NPCS_FLAG := + +##-npro或--ignore-profile 　不要读取indent的配置文件.indent.pro。 +NPRO_FLAG := -npro + +##-nprs或--space-after-procedure-calls 　在"（"后"）"前不插入空格 。 +NPRS_FLAG := -nprs + +##-npsl或--dont-break-procedure-type 　程序类型与程序名称放在同一行。 +NPSL_FLAG := -npsl + +##--space-after-for saf for后面有空格 +SAF_FLAG := -saf + +##--space-after-if sai if后面有空格 +SAI_FLAG := -sai + +##--space-after-while saw while后面有空格 +SAW_FLAG := -saw + +##-nsc或--dont-star-comments 　注解左侧不要加上星号(*)。 +NSC_FLAG := -nsc + +##-nsob或--leave-optional-semicolon 　不用处理多馀的空白行。 +NSOB_FLAG := + +##-nss或--dont-space-special-semicolon 　若for或while区段仅有一行时，在分号前不加上空格。 +NSS_FLAG := -nss + +##-nv或--no-verbosity 　不显示详细的信息。 +NV_FLAG := -nv + +##`-nut' +##`--no-tabs' +##Use spaces instead of tabs. +NUT_FLAG := +##-nut + +##-pcs或--space-after-procedure-calls 　在调用的函数名称与"("之间加上空格。 +PCS_FLAG := -pcs + +##`-prs' +##`--space-after-parentheses' +##Put a space after every '(' and before every ')'. +PRS_FLAG := + +##`-pin' +##`--paren-indentationn' +##Specify the extra indentation per open parentheses '(' when a statement is broken. +PI_FLAG := +##-pi4 + +##-psl或--procnames-start-lines 　程序类型置于程序名称的前一行。 +PSL_FLAG := + +##-sc或--start-left-side-of-comments 　在每行注释左侧加上星号(*)。 +SC_FLAG := + +##-sob或--swallow-optional-blank-lines 　删除多馀的空白行。 +SOB_FLAG := -sob + +## -sbin, --struct-brace-indentationn +## Indent braces of a struct, union or enum N spaces. +SBI_FLAGE := -sbi4 + +##-ss或--space-special-semicolon 　若for或swile区段今有一行时，在分号前加上空格。 +SS_FLAG := -ss + +##-st或--standard-output 　将结果显示在标准输出设备。 +ST_FLAG := + +##-T 　数据类型名称缩排。 +T_FLAG := -T + +##-ts<格数>或--tab-size<格数> 　设置tab的长度。 +TS_FLAG := -ts4 +##-ts4 + +##--use-tabs ut 使用tab来缩进 +UT_FLAG := -ut +##-ut + +##-v或--verbose 　执行时显示详细的信息。 +V_FLAG := -v + + +##-version 　显示版本信息。 +VER_FLAG := + + + + + +##未实现的风格： +##1,（）与变量间加空格 (以实现) +##2, else 独立成行 +##3, 注释缩进 +##4，每个函数前加注释段 + +## indent flags +## -bad -bap -bbb -bbo -bl -bli4 -bls -bs -c33 -cd33 -ce -ci4 -cli0 +## -cp33 -cs -d0 -di4 -fc1 -hnl -i4 -ip4 -lp -nbc -ncdb -nbfda -ncdw +## -nfc1 -nfca -npro -npsl -nsc -nv -pcs -saf -sai -saw -sob -ss -T -ts4 -ut + +INDENT_FLAGS1 := $(GNU_FLAG) \ + $(KR_FLAG) \ + $(ORG_STYLE) \ + $(BAD_FLAG) \ + $(BAP_FLAG) \ + $(BBB_FLAG) \ + $(BBO_FLAG) \ + $(BC_FLAG) \ + $(BL_FLAG) \ + $(BLI_FLAG) \ + $(BLS_FLAG) \ + $(BR_FLAG) \ + $(BS_FLAG) \ + $(CBI_FLAG) \ + $(CW_FLAG) \ + $(CD_FLAG) \ + $(CDB_FLAG) \ + $(CE_FLAG) \ + $(CI_FLAG) \ + $(CLI_FLAG) \ + $(CP_FLAG) \ + $(CS_FLAG) \ + $(D_FLAG) \ + $(DI_FLAG) \ + $(FC1_FLAG) \ + $(FCA_FLAG) \ + $(HNL_FLAG) \ + $(I_FLAG) \ + $(IP_FLAG) \ + $(LINE_FLAG ) \ + $(LP_FLAG) \ + $(NBAD_FLAG) \ + $(NBAP_FLAG) \ + $(NBBB_FLAG) \ + $(NBC_FLAG) \ + $(NCBD_FLAG) \ + $(NBFDA_FLAG) \ + $(NCDW_FLAG) \ + $(NCE_FLAG) \ + $(NCS_FLAG) \ + $(NFC1_FLAG) \ + $(NFCA_FLAG) \ + $(NIP_FLAG) \ + $(NLP_FLAG) \ + $(NPCS_FLAG) \ + $(NPRO_FLAG) \ + $(NPRS_FLAG) \ + $(NPSL_FLAG) \ + $(NSC_FLAG) \ + $(NSOB_FLAG) \ + $(NSS_FLAG) \ + $(NV_FLAG) \ + $(PCS_FLAG) \ + $(PI_FLAG) \ + $(PSL_FLAG) \ + $(PRS_FLAG) \ + $(SAF_FLAG) \ + $(SAI_FLAG) \ + $(SAW_FLAG) \ + $(SBI_FLAGE) \ + $(SC_FLAG) \ + $(SOB_FLAG) \ + $(SS_FLAG) \ + $(ST_FLAG) \ + $(T_FLAG) \ + $(TS_FLAG) \ + $(UT_FLAG) \ + $(V_FLAG) \ + $(VER_FLAG) \ + $(NUT_FLAG) + +INDENT_FLAGS = -kr -i4 + + +##$(warning $(INDENT_FLAGS) $(1)) +##-------------------------------------- +## +## MAKE_INDENT template +## +##------------------------------------ + +define INDENT_FILE + +indent $(INDENT_FLAGS) $(1) + +endef + +define MAKE_INDENT +@echo +@echo "[Indent flags ]: $(INDENT_FLAGS)" +@echo "" +$(foreach file,$(1),$(call INDENT_FILE, $(file))) +@echo +@echo ===================================Indent End=================================== +endef + + + + + + + + + + + diff --git a/include/Makefile.rules b/include/Makefile.rules new file mode 100644 index 0000000..7a82089 --- /dev/null +++ b/include/Makefile.rules @@ -0,0 +1,350 @@ + +##----------------------------------------------------------## +## ## +## Universal Makefile Rules ## +## ## +## Created : Wei Liu 07/03/07 ## +## Revision: [Last]Wei Liu 07/07/07 ## +## ## +##----------------------------------------------------------## + + +UMAKE_VERSION := V2.0 + +##------------------------------------- +## +## Work Directory : /usr/local/include +## Default Target : all +## +##------------------------------------- +default: all +.PHONY: all clean rebuild test indent splint doc \ + dir config check bk lsbk rmbk unzip umakever usage\ + FORCE +.SUFFIXES: + +umakever: + @echo "Universal Makefile (UMake) Version: $(UMAKE_VERSION)" + +##-------------------------------------- +## +## Makefile CFG defination check +## +##-------------------------------------- + +ifeq "$(MODULE)" "" +$(error Please input the module name (MODULE = )in makefile. ) +endif + +ifeq "$(CFG)" "" +CFG=debug +$(warnning No configuration specified for CFG. Defaulting to $(MODULE) - debug. ) +endif + +ifeq "$(BUILD)" "" +BUILD=lib +$(warnning No configuration specified for BUILD. Defaulting to create lib$(MODULE).a. ) +endif + +ifeq "$(SRC_PATH)" "" +SRC_PATH=. +$(warnning No configuration specified for SRC_PATH. Defaulting to ./. ) +endif + +COVER_NEED ?= no +PLT_PATH ?= ../../plat +APP_PATH ?= ../../app +TYPE ?= plat + +##-------------------------------------- +## +## Gcc Flag for debug or release +## +##-------------------------------------- +CC := gcc +GCC_CFLAGS := -Wall -MM +AR_LINK := ar -r + +RELS_FLAGS_ADD += -DNDEBUG +RELEASE_CFLAGS += -g -Wall -I. $(RELS_FLAGS_ADD) +RELEASE_LINK_CFLAGS = -g $(RELS_FLAGS_ADD) -o +DEBUG_CFLAGS += -g -Wall -rdynamic -DDEBUG -I. $(DBUG_FLAGS_ADD) +DEBUG_LINK_CFLAGS = -g -rdynamic -DDEBUG -o + +ifeq "$(COVER_NEED)" "yes" +DEBUG_CFLAGS += -fprofile-arcs -ftest-coverage -pg +endif + +GCC_CFLAGS=$(DEBUG_CFLAGS) +GCC_LINK_CFLAGS=$(DEBUG_LINK_CFLAGS) + +##-------------------------------------- +## +## Project setting +## +##-------------------------------------- +OBJDIR:=./obj +LIBDIR:=./lib +UTDIR :=./ut +DOCDIR:=./doc +DIRBUILD=$(OBJDIR) + +ifeq "$(BUILD)" "lib" +BINDIR:=./bin +OUTFILE=$(LIBDIR)/lib$(MODULE).a +DIRNEED=$(UTDIR) $(DOCDIR) +DIRBUILD+=$(LIBDIR) +else +BINDIR:=. +OUTFILE=$(BINDIR)/$(MODULE) +DIRNEED= +DIRBUILD+=$(BINDIR) +endif + +##-------------------------------------- +## +## source , object and dependencies files +## +##-------------------------------------- + +SRC_SUBDIR := $(shell find $(SRC_PATH) -type d) + +vpath %.c $(SRC_SUBDIR) +vpath %.o $(OBJDIR) +vpath %.d $(OBJDIR) + +SRC_FULL_PATH = $(foreach dir,$(SRC_SUBDIR),$(wildcard $(dir)/*.c)) +SRC_FILES = $(foreach file, $(notdir $(SRC_FULL_PATH)) ,$(OBJDIR)/$(file)) +COMMON_OBJ = $(SRC_FILES:%.c=%.o) + +TEST_OBJ_PATH ?= ../../obj + +TEST_OBJ = $(foreach dir,$(TEST_OBJ_PATH),$(wildcard $(dir)/*.o)) + +OBJ=$(COMMON_OBJ) $(OBJ_ADD) +ALL_OBJ := $(OBJ) $(TEST_OBJ) + +##-------------------------------------- +## +## Lib setting +## +##-------------------------------------- + +ifeq "$(COVER_NEED)" "yes" +LIBCOVER=-lgcov +endif + +MODULE_PLT_LIB=$(foreach lib,$(PLT_LIB), -L$(PLT_PATH)/$(lib)/lib/ -l$(lib) ) +MODULE_PLT_LIB+=-lm + + +MODULE_APP_LIB=$(foreach lib,$(APP_LIB),-L$(APP_PATH)/$(lib)/lib -l$(lib)) + +ifneq (,$(findstring hlr,$(PLT_LIB))) +MODULE_APP_LIB= +##-L../app/ae/src/lib -lpubfunc +endif + +ifneq (,$(findstring auceir,$(PLT_LIB))) +MODULE_APP_LIB= +##-L../app/ae/src/lib -lpubfunc -L../usr/lib -la3a8 -ldl -lpopt +endif + +##-------------------------------------- +## +## Rules +## +##-------------------------------------- +CCFLAG_SWITCH ?= off +CC_COMPILE =$(CC) $(GCC_CFLAGS) -c $< -o $@ +CC_PRG_LINK=$(CC) $(GCC_LINK_CFLAGS) $(OUTFILE) $(ALL_OBJ) $(LIBCOVER) $(MODULE_APP_LIB) $(MODULE_PLT_LIB) $(LIB_ADD) +CC_LIB_LINK=$(AR_LINK) $(OUTFILE) $(ALL_OBJ) + +COMPILE=$(CC_COMPILE) +PRG_LINK=$(CC_PRG_LINK) +LIB_LINK=$(CC_LIB_LINK) + +ifeq "$(BUILD)" "exef" +LINK=$(PRG_LINK) +else +LINK=$(LIB_LINK) +endif + +# Build rules + +all: preproc start dir $(ALL_OBJ) #prtdebug + @echo Linking :$(OUTFILE) +ifeq "$(CCFLAG_SWITCH)" "off" + @$(LINK) +else + $(LINK) +endif + @$(POSTPROC_CMD) + @echo -e "\n================================================================================\n" + +sinclude $(DEPENDS) + +release : CC_COMPILE =$(CC) $(RELEASE_CFLAGS) -c $< -o $@ +release : CC_PRG_LINK=$(CC) $(RELEASE_LINK_CFLAGS) $(OUTFILE) $(ALL_OBJ) $(MODULE_APP_LIB) $(MODULE_PLT_LIB) $(LIB_ADD) +release : all + +##-------------------------------------- +## +## Make command to use for dependencies +## +##-------------------------------------- + +MAKE :=make +RM :=rm +MKDIR :=mkdir + +preproc: + @$(PREPROC_CMD) + +start: + @echo -e "\n================================================================================\n" + @echo "[Building Project]: $(notdir $(MODULE))" +ifeq "$(CCFLAG_SWITCH)" "off" + @echo "Show Gcc Flags switch = OFF" +endif + +prtdebug: + @echo "$(MODULE)-$(BUILD)[$(CFG)] build source file:" "$(SRC_FULL_PATH)" + @echo SRC_SUBDIR: $(SRC_SUBDIR) + @echo SRC_FULL_PATH : $(SRC_FULL_PATH) + @echo SRC_FILES : $(SRC_FILES) + @echo ALL_OBJ : $(ALL_OBJ) + @echo LIB:$(MODULE_PLT_LIB) + @echo PLT_LIB: $(PLT_LIB) + @echo CCFLAG_SWITCH :$(CCFLAG_SWITCH) + +config: dir + +dir: + @$(foreach dir,$(DIRNEED),$(MKDIR) -p $(DIRNEED) --mode=0777; ) + @$(foreach dir,$(DIRBUILD),$(MKDIR) -p $(dir) --mode=0777; ) + +##-------------------------------------- +## +## Make Rebuild and clean +## +##-------------------------------------- + +ifneq "$(PROJ)" "" +FRIEND_PROJ := $(shell ) +endif + +jumprebuild: +ifneq "$(PROJ)" "" + @cd $(FRIEND_PROJ); mak rebuild ; cd - +endif + +# Rebuild this project +rebuild: jumprebuild cleanall all + +# Clean this project and all dependencies +cleanall: clean + +# Clean this project +clean: + @echo -e "||--------------------------------------------------------------- " + @echo -e "|| Umake clean gcc , lcov, doxygen generated and temporary files. " + @echo -e "||--------------------------------------------------------------- " + @$(RM) -rf $(OBJDIR) $(OUTFILE) $(COVER_REPORT_PATH) ./doc/doxygen.conf ./doc/html ./doc/latex ./doc/rtf $(foreach dir,$(SRC_SUBDIR),$(dir)/*~) + + +##-------------------------------------- +## +## indent Makefile.indent +## +##-------------------------------------- +include $(MAKE_INCLUDE)/Makefile.indent + +indent: + @chmod 777 $(SRC_FULL_PATH) + @echo ===================================Indent START================================= + @echo + @echo "[Indent source file ]: $(SRC_FULL_PATH)" + $(call MAKE_INDENT , $(SRC_FULL_PATH)) + +##-------------------------------------- +## +## splint makefile.splint +## +##-------------------------------------- +include $(MAKE_INCLUDE)/Makefile.splint + +SPLINT_FLAG_SWITCH ?= off + +splint: + @chmod 777 $(SRC_FULL_PATH) + @echo =================================Splint START================================== + @echo +ifeq "$(SPLINT_FLAG_SWITCH)" "on" + @echo "[Splint flags ]: $(SPLINT_FLAGS)" +endif + @echo "[Lint Clean Project]: $(notdir $(MODULE))" + $(call MAKE_SPLINT, $(SRC_FULL_PATH)) + +##-------------------------------------- +## +## doc Makefile.doxygen +## +##-------------------------------------- +include $(MAKE_INCLUDE)/Makefile.doxygen + +doc: + @chmod 777 $(SRC_FULL_PATH) + @echo ==================================Doxygen START================================= + @echo + $(call MAKE_DOC, $(SRC_FULL_PATH)) + + +##-------------------------------------- +## +## backup Makefile.backup +## +##-------------------------------------- +include $(MAKE_INCLUDE)/Makefile.backup + +##-------------------------------------- +## +## cov Makefile.cov +## +##-------------------------------------- +include $(MAKE_INCLUDE)/Makefile.cov + +##-------------------------------------- +## +## usage Makefile.usage +## +##-------------------------------------- +include $(MAKE_INCLUDE)/Makefile.usage + +##-------------------------------------- +## +## Make dependencies +## +##-------------------------------------- + +$(OBJDIR)/%.d:%.c + @$(CC) $< -MM -MD -o $@ + +$(OBJDIR)/%.o:%.c + +ifeq "$(CCFLAG_SWITCH)" "off" + @echo -e "building: $(notdir $@) \t\t\t\t please wait ..." + @$(COMPILE) +else + $(COMPILE) +endif + +DEPENDS=$(COMMON_OBJ:.o=.d) + +##-------------------------------------- +## +## Make force +## +##-------------------------------------- +FORCE: + diff --git a/include/Makefile.splint b/include/Makefile.splint new file mode 100644 index 0000000..3c50c5c --- /dev/null +++ b/include/Makefile.splint @@ -0,0 +1,288 @@ + +##----------------------------------------------------------## +## ## +## Universal Makefile Splint Function ## +## ## +## Created : Wei Liu 07/05/20 ## +## Revision: [Last]Wei Liu 07/07/07 ## +## ## +##----------------------------------------------------------## + +##-------------------------------------- +## +## Make splinting program flags +## +##-------------------------------------- + +##是否有提示信息 +SFLAG_HINTS := #-hints + +##是否用库信息代替头文件 +SFLAG_INCLUDE := +single-include +#+never-include + +##包含什么库 +SFLAG_LIB := +posixlib +##+nolib +nof -warnposix +##+unixlib +##+posixlib +#+nolib +nof -warnposix +##+nof +##+unixlib +##+which_lib + +## +SFLAG_DUMP := +##dump ./include/public.h ./include/pub_base.h ./include/includes.h +SFLAG_LOAD := +##+load /usr/share/splint/lib/unixstrict.lcd +##load ./include/public.h ./include/pub_base.h ./include/includes.h + +SFLAG_DIR := +##-I/work/r9/plat/public/src/include/splint +##-I/work/r9/plat/public/src/include/splint +##-I /usr/local/work/r9/plat/public/src/include/ + +##检查模式 +SFLAG_TYPE := -strict + +##略过的头文件 +SFLAG_SYS_HEADERS := +skip_sys_headers +SFLAG_ISO_HEADERS := +#+skip_iso_headers +SFLAG_POSIX_HEADERS := +##+skip_posix_headers + +##每个头文件只检查一次 +SFLAG_SINGLE_INCLUDE := +singleinclude + +##系统文件目录 +SFLAG_SYS_DIR := +##+sys-dirs /work/r9/plat/public/src/include/splint + +##函数参数有原型 +SFLAG_PROTO_PARAMNAME := -protoparamname + +##变量名是否为保留名 +SFLAG_UNDERSCORE := -isoreserved -isoreservedinternal + +## 在"/*"和"*/"中再次使用"/*"和"*/" +SFLAG_NESTCOMMENT := -nestcomment + +##允许未说明导出变量、函数和类型 +SFLAG_EXPORT_VAR := -exportvar +SFLAG_EXPORT_FCN := -exportfcn +SFLAG_EXPORT_TYPE := -exporttype +SFLAG_EXPORT_CONST := -exportconst + +##允许其他类型定义为BOOL型 +SFLAG_LIKELY_BOOL := -likelybool + +##两种类型相等 +SFLAG_CHAR_INT := +charint +SFLAG_BOOL_INT := +boolint + +##Report memory transfer errors for initializations to read-only string literals +SFLAG_READONLY_TRANS := -readonlytrans + +##A string literal is assigned to a char array that smaller than the string literal needs +SFLAG_STRING_SMALLER := -stringliteralsmaller + +##A variable declared outside a macro body starts with the macro-var-prefix +SFLAG_MACRO_PREFIX := -macrovarprefixexclude + +##Initializer does not define all elements of a declared array +SFLAG_INITAL_ELEMENT := -initallelements + +##类型匹配 +SFLAG_PARAM_TYPE := -type + +##Report modification errors in functions declared without a modifies clause +SFLAG_MODIFY := -modnomods + +##Use of a checked global in a function with no globals list +SFLAG_GLOBAL := -glob-noglobs + +##Use of internal state in function with no globals list +SFLAG_INTERNAL_GLOBS := -internal-globs-noglobs + +##Implicit checked qualifier on global variables and qualifier file static scope variables with no checking annotation +SFLAG_CHECK_GLOBAL := -imp-checkedstrict-globs -imp-checkedstrict_statics + +##Undocumented modification of a checked global variable in a function with no modifies clause +SFLAG_CHECK_GLOBAL_MODIFY := -mod-globs-nomods + +##Storage declared with observer may be modified through a call to an unconstrained function +SFLAG_OBSERVER_MODIFY := -mod-observer-uncon + +##忽略返回值 +SFLAG_IGNORE_RETVAL := -retval + +##while,if and for statement is not a block +SFLAG_WHILE_BLOCK := -whileblock +SFLAG_IF_BLOCK := -ifblock +SFLAG_FOR_BLOCK := -forblock + +##There is no finals else following an else if construct +SFLAG_ELSEIF_COMPLETE := -elseifcomplete + +##允许指针进行数学运算 +SFLAG_POINT_ARITH := -ptrarith -nullptrarith + +##An unconstrained function is called in a function body where modifications are checked. +SFLAG_UNCONSTRAIN_MODIFY := -mod-uncon-nomods + +##NO effect of unconstrained functions +SFLAG_EFFECT_UNCONSTRAIN := -no-effect-uncon + +##Type-mismatch in parameter corresponding to format code in a printflike or scanflike function +SFLAG_FORMAT-TYPE := -format-type + +##An actual parameter that is passed as a unique formal parameter is aliased by another parameter or global variable +SFLAG_ALIASING := -alias-unique -ret-alias#-may-alias-unique + +##Transfer Errors flag +SFLAG_STORAGE_TRANSFER := -onlytrans -temptrans -unqualified-trans -immediatetrans + +##Report errors for break statements inside a nested while, for or switch +SFLAG_DEEP_BREAK := -deep-break #-switch-switch-break -loop-loop-break + +##Storage has inconsistent states of alternate paths through a branch +SFLAG_INCONSISTENT_BRANCH := -branch-state + +##There is a non-empty case in a switch not followed by a break. +##Likely infinite loop is detected +##Likely infinite loop is detected. Loop test or body calls an unconstrained function that may produce an undetected modification +SFLAG_PROBLEMATIC_CTR := -case-break -infloops -infloopsuncon + +##An expression may be undefined because a sub-expression contains a call to an unconstrained function (no modifies clause) +##that may modify something that may be modified or used by another sub-expression +SFLAG_UNDEFINED_EVALORDER := -eval-order-uncon + +##Only storage transferred to an unqualified global or static reference. +##This may lead to a memory leak, since the new reference is not necessarily released +SFLAG_INITIALIZERS := -only-unq-global-trans + +##Primitive operation does not type check strictly +SFLAG_PRIMITIVE_OPERA := -strict-ops -bitwise-signed + +##Unused Declarations （未使用的声明） +SFLAG_DECLARARIONS := -field-use -fcnuse -param-use -typeuse -varuse -enummemuse + +##Function, variable, iterator or constant declared but never defined (未初始化) +SFLAG_COMPLETE_PRG := -decl-undef + +##A declaration is exported but not used outside this module or not appear in a header file +SFLAG_EXPORTS := -export-local -export-header + +##把warning输出到文件splint_warn中 +SFLAG_WARN_FILE := #+warning-stream splint_warn + +##把致命错误输出到文件splint_error中 +SFLAG_ERROR_FILE := #+error-stream splint_error + +##文件覆盖 +SFLAG_STREAM_OVERWRITE := -streamoverwrite + +##An abstract type defined in M.h (or specified in M.lcl) is accessible in M.c +SFLAG_ACCESS := -access-module + +##Function definition is in old style syntax. Standard prototype syntax is preferred. +SFLAG_ISO_CONFORMANCE := #-old-style + +##Use of function that may lead to buffer overflow +SFLAG_BUFFER := -bufferoverflowhigh + +##A function is declared without a parameter list prototype +SFLAG_FUNC_NOPARAM := -noparams + +##Operand of sizeof operator is a type +SFLAG_SIZEOF_TYPE := -sizeoftype + +##Storage derivable from a parameter, return value or global variable is not completely defined +SFLAG_COMP_DEF := -compdef + +##Behavior of an expression is unspecified or implementation-dependent +##because sub-expressions contain interfering side effects that may be evaluated in any order +SFLAG_EVAL_ORDER := -eval-order + +##try to recover code +SFLAG_TRY_TO_RECOVER := #+trytorecover + +##返回一个NULL指针 +SFLAG_NULL_RET := -nullret + +##A possibly null pointer is reachable from a parameter or global variable that is not declared using a /*@null@*/ annotation +SFLAG_NULL_STATE := -nullstate + +##The value of a location that may not be initialized on some execution path is used +SFLAG_USE_BEFORE_DEF := -usedef + +##编译时不知道参数类型 Format parameter is not known at compile-time 例如:sprintf(mgcpAsciTempBuf, msg) +SFLAG_FORMAT_CONST := -format-const + +##Argument to exit has implementation defined behavior. The only valid arguments to exit are EXIT_SUCCESS, EXIT_FAILURE and 0. +##An error is reported if Splint can determine statically that the argument to exit is not one of these +SFLAG_EXIT_ARG := -exitarg + +##An extern declaration is used inside a function body +SFLAG_EXTERN := -nested-extern + + + +SFLAG_OLD_STTLE := -oldstyle + + +SFLAG_SHIFT_NEG := -shiftnegative + + +SFLAG_PREPROC := -preproc + +##all splint flags + +SPLINT_FLAGS := $(SFLAG_LIB) $(SFLAG_TYPE) $(SFLAG_SYS_HEADERS) $(SFLAG_ISO_HEADERS)\ + $(SFLAG_POSIX_HEADERS) $(SFLAG_SINGLEINCLUDE) $(SFLAG_WARN)\ + $(SFLAG_UNDERSCORE) $(SFLAG_NESTCOMMENT) $(SFLAG_EVAL_ORDER)\ + $(SFLAG_PROTO_PARAMNAME) $(SFLAG_EXPORT_VAR) $(SFLAG_EXPORT_FCN)\ + $(SFLAG_EXPORT_TYPE) $(SFLAG_LIKELY_BOOL) $(SFLAG_CHAR_INT)\ + $(SFLAG_READONLY_TRANS) $(SFLAG_STRING_SMALLER) $(SFLAG_MACRO_PREFIX)\ + $(SFLAG_INITAL_ELEMENT) $(SFLAG_PARAM_TYPE) $(SFLAG_GLOBAL)\ + $(SFLAG_CHECK_GLOBAL) $(SFLAG_CHECK_GLOBAL_MODIFY) $(SFLAG_IGNORE_RETVAL)\ + $(SFLAG_INTERNAL_GLOBS) $(SFLAG_MODIFY) $(SFLAG_BOOL_INT)\ + $(SFLAG_WHILE_BLOCK) $(SFLAG_HINTS) $(SFLAG_IF_BLOCK) $(SFLAG_FOR_BLOCK)\ + $(SFLAG_POINT_ARITH) $(SFLAG_ELSEIF_COMPLETE) $(SFLAG_UNCONSTRAIN_MODIFY)\ + $(SFLAG_EFFECT_UNCONSTRAIN) $(SFLAG_OBSERVER_MODIFY)\ + $(SFLAG_FORMAT-TYPE) $(SFLAG_ALIASING) $(SFLAG_STORAGE_TRANSFER)\ + $(SFLAG_DEEP_BREAK) $(SFLAG_INCONSISTENT_BRANCH) $(SFLAG_PROBLEMATIC_CTR)\ + $(SFLAG_UNDEFINED_EVALORDER) $(SFLAG_INITIALIZERS) $(SFLAG_PRIMITIVE_OPERA)\ + $(SFLAG_DECLARARIONS) $(SFLAG_COMPLETE_PRG) $(SFLAG_EXPORTS) $(SFLAG_INCLUDE)\ + $(SFLAG_STREAM_OVERWRITE) $(SFLAG_WARN_FILE) $(SFLAG_ERROR_FILE)\ + $(SFLAG_ACCESS) $(SFLAG_ISO_CONFORMANCE) $(SFLAG_BUFFER) $(SFLAG_SIZEOF_TYPE)\ + $(SFLAG_COMP_DEF) $(SFLAG_FUNC_NOPARAM) $(SFLAG_TRY_TO_RECOVER)\ + $(SFLAG_EXPORT_CONST) $(SFLAG_DUMP) $(SFLAG_LOAD) $(SFLAG_NULL_RET)\ + $(SFLAG_NULL_STATE) $(SFLAG_USE_BEFORE_DEF) $(SFLAG_FORMAT_CONST)\ + $(SFLAG_EXIT_ARG) $(SFLAG_EXTERN) $(SFLAG_OLD_STTLE) $(SFLAG_DIR)\ + $(SFLAG_SHIFT_NEG) $(SFLAG_PREPROC) + +##-------------------------------------- +## +## MAKE_INDENT template +## +##------------------------------------ + +define SPLINT_FILE +@echo -e "Splinting: $(notdir $(1)) \t\t\t please wait ..." +@nohup splint $(SPLINT_FLAGS) $(1) | sed '$d' | sed '1,2d' |\ + sed '/Splint /d' | sed '/Finished /d' |\ + sed '/Cannot continue/d' + +endef + +##@echo $(SPLINT_FLAGS) +define MAKE_SPLINT +@echo + +$(foreach file,$(1),$(call SPLINT_FILE, $(file))) +@echo +@echo =======================================End====================================== +endef \ No newline at end of file diff --git a/include/Makefile.usage b/include/Makefile.usage new file mode 100644 index 0000000..579b49b --- /dev/null +++ b/include/Makefile.usage @@ -0,0 +1,36 @@ + +##----------------------------------------------------------## +## ## +## Universal Makefile usage ## +## ## +## Created : Wei Liu 07/04/11 ## +## Revision: [Last]Wei Liu 07/07/09 ## +## ## +##----------------------------------------------------------## + +##------------------------------------- +## +## Universal Makefile Usage +## +##------------------------------------- + +usage: + @echo "usage: [make ] = make all " + @echo "usage: [make all ] " + @echo "usage: [make clean ] " + @echo "usage: [make rebuild ] " + @echo "usage: [make test ] " + @echo "usage: [make indent ] " + @echo "usage: [make splint ] " + @echo "usage: [make prtdebug ] " + @echo "usage: [make dir ] " + @echo "usage: [make config ] = make dir now " + @echo "usage: [make check ] = not supported now " + @echo "usage: [make bk ] " + @echo "usage: [make lsbk ] " + @echo "usage: [make rmbk backfile=*/[filename]] " + @echo "usage: [make unzip backfile=[filename] ] " + @echo "usage: [make version ] " + @echo "usage: [make umakever ] " + + diff --git a/mss/Makefile b/mss/Makefile new file mode 100644 index 0000000..e447d2a --- /dev/null +++ b/mss/Makefile @@ -0,0 +1,15 @@ +src_dir=`pwd` + +.PHONY: all clean + +all: agtocs_all + +clean: agtocs_clean + +agtocs_all: + $(MAKE) -C main + +agtocs_clean: + $(MAKE) -C main clean + + diff --git a/mss/main/Makefile b/mss/main/Makefile index f2f8d30..d7405dc 100644 --- a/mss/main/Makefile +++ b/mss/main/Makefile @@ -3,9 +3,6 @@ ## ## ## Universal Makefile for module template : V1.6.3 ## ## ## -## Created : Wei Liu 07/04/11 ## -## Revision: [Last]Wei Liu 07/07/07 ## -## ## ##----------------------------------------------------------## ##---------------------------------------------------------------------## @@ -45,7 +42,6 @@ ##---------------------------------------------------------------------## -MODULE = agtocs TYPE = app DBUG_FLAGS_ADD = -D_LKSCTP @@ -65,6 +61,8 @@ SRC_PATH = ./src INC_PATH = ./src/include PLT_PATH = ../../plat APP_PATH = ../../mss +BIN_PATH = ../../bin +MODULE = $(BIN_PATH)/agtocs OBJ_ADD = TEST_OBJ_PATH = @@ -95,4 +93,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/Makefile b/plat/Makefile new file mode 100644 index 0000000..34a22c3 --- /dev/null +++ b/plat/Makefile @@ -0,0 +1,30 @@ +# Makefile for platform + +PLATDIR = $(shell pwd) +BINDIR = $(PLATDIR)/../bin +PLATMODULELIST = debug diameter iptrans m2ua mtp3 public radius sccp scf smpp snmp tcap tcp xapp + +.PHONY: all $(PLATMODULELIST) clean + +# default all +all: $(PLATMODULELIST) + +# plat module list +$(PLATMODULELIST): + @echo "====================== make $@ =======================" + @cd $(PLATDIR)/$@ && $(MAKE) + # @if [ $@ = "iptrans" ]; then \ + # cd $(PLATDIR)/$@; \ + # ./mkiptrans.sh; \ + # cp -f ./iptrans $(BINDIR); \ + # fi + @cd - + +# clean +clean: + @for mod in $(PLATMODULELIST); do \ + echo "====================== clean $$mod ======================="; \ + cd $(PLATDIR)/$$mod && $(MAKE) clean; \ + cd -; \ + done + diff --git a/plat/debug/Makefile b/plat/debug/Makefile index 24c4ed1..af5e4fd 100644 --- a/plat/debug/Makefile +++ b/plat/debug/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/iptrans/Makefile b/plat/iptrans/Makefile index 8fd1483..e010076 100644 --- a/plat/iptrans/Makefile +++ b/plat/iptrans/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/m2ua/Makefile b/plat/m2ua/Makefile index 6a781e9..60d5991 100644 --- a/plat/m2ua/Makefile +++ b/plat/m2ua/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/mtp3/Makefile b/plat/mtp3/Makefile index 7663aa0..1a6819d 100644 --- a/plat/mtp3/Makefile +++ b/plat/mtp3/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/public/Makefile b/plat/public/Makefile index 373be1b..fbf49ad 100644 --- a/plat/public/Makefile +++ b/plat/public/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/public/ut/main/Makefile b/plat/public/ut/main/Makefile index 8accec4..36f9497 100644 --- a/plat/public/ut/main/Makefile +++ b/plat/public/ut/main/Makefile @@ -92,7 +92,8 @@ COVER_REPORT_PATH = ./ut/ut_doc/output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/public/ut/timer/Makefile b/plat/public/ut/timer/Makefile index 2ceeb9e..4443bd2 100644 --- a/plat/public/ut/timer/Makefile +++ b/plat/public/ut/timer/Makefile @@ -69,4 +69,5 @@ COVER_REPORT_PATH = ./ut/ut_doc/output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/radius/Makefile b/plat/radius/Makefile index b5ed5ea..df049c7 100644 --- a/plat/radius/Makefile +++ b/plat/radius/Makefile @@ -92,4 +92,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/radius/src/include/radius_pub.h b/plat/radius/src/include/radius_pub.h index c46cfb6..48f0e43 100644 --- a/plat/radius/src/include/radius_pub.h +++ b/plat/radius/src/include/radius_pub.h @@ -13,7 +13,9 @@ #include #include #include +#if HAVE_STROPTS_H #include +#endif #include #include #include diff --git a/plat/radius/ut/Makefile b/plat/radius/ut/Makefile index aaff0c8..782369d 100644 --- a/plat/radius/ut/Makefile +++ b/plat/radius/ut/Makefile @@ -98,4 +98,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/sccp/Makefile b/plat/sccp/Makefile index 545ff31..cc9852c 100644 --- a/plat/sccp/Makefile +++ b/plat/sccp/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/sccp/ut/fsmtest/Makefile b/plat/sccp/ut/fsmtest/Makefile index 2bff29e..dbf4294 100644 --- a/plat/sccp/ut/fsmtest/Makefile +++ b/plat/sccp/ut/fsmtest/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./ut/ut_doc/output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/scf/Makefile b/plat/scf/Makefile index b6c697f..85882bd 100644 --- a/plat/scf/Makefile +++ b/plat/scf/Makefile @@ -89,4 +89,5 @@ COVER_REPORT_PATH = /ut/ut_doc/output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/smpp/Makefile b/plat/smpp/Makefile index ae99359..c5bb9a4 100644 --- a/plat/smpp/Makefile +++ b/plat/smpp/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/snmp/Makefile b/plat/snmp/Makefile index b7a96f5..b919410 100644 --- a/plat/snmp/Makefile +++ b/plat/snmp/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/tcap/Makefile b/plat/tcap/Makefile index 689c379..10a49b1 100644 --- a/plat/tcap/Makefile +++ b/plat/tcap/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/tcp/Makefile b/plat/tcp/Makefile index 21d9984..81f13fe 100644 --- a/plat/tcp/Makefile +++ b/plat/tcp/Makefile @@ -95,4 +95,5 @@ COVER_REPORT_PATH = ./output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules diff --git a/plat/xapp/Makefile b/plat/xapp/Makefile index 0f3b8b8..045a9ba 100644 --- a/plat/xapp/Makefile +++ b/plat/xapp/Makefile @@ -92,4 +92,5 @@ COVER_REPORT_PATH = ./ut/ut_doc/output ## include makefile.rules (Do not change) ## ##-------------------------------------- -include Makefile.rules +MAKE_INCLUDE = ../../include +include $(MAKE_INCLUDE)/Makefile.rules