OCT

REM: 修改Makefile调试信息开关
2019-06-12 17:27:12 +08:00 · 2019-06-12 17:27:12 +08:00 · 538804c8a1
parent dea2b36d44
commit 538804c8a1
2 changed files with 35 additions and 33 deletions
--- a/Common/common.Makefile
+++ b/Common/common.Makefile
@ -16,7 +16,7 @@ endif
 SHELL	:= /bin/sh

 # 构建信息开关，是否显示 gcc、ld 等命令执行的命令行消息，默认关闭
-ENABLE_MAKE_LOG := FALSE
+ENABLE_MAKE_LOG ?= FALSE

 # 调试信息分离开关，默认开启
 TARGET_STRIP ?= TRUE
@ -83,7 +83,7 @@ endif
 ifeq ($(ENABLE_MAKE_LOG), TRUE)
 MLOG	:=
 else
-MLOG	:= @
+MLOG	?= @ 
 endif

 # 判断构建模式 debug/release
--- a/64
+++ b/64
@ -1,12 +1,14 @@
 SHELL	:= /bin/sh
-OUTPUT_MAKE_DEBUG = FALSE
+OUTPUT_MAKE_DEBUG ?= FALSE

 ifeq ($(OUTPUT_MAKE_DEBUG), TRUE)
 DIS_BUILD_WARRING 	?= FALSE
 EN_MAKE_MSG			?= TRUE
+MLOG				:= 
 else
 DIS_BUILD_WARRING 	?= TRUE
 EN_MAKE_MSG			?= FALSE
+MLOG				:= @
 endif

 ifeq ($(EN_MAKE_MSG), TRUE)
@ -38,49 +40,49 @@ $(shell test -e ./Common/compile.h || ./build_env.sh)
 	
 demo:
 ifeq ($(OPT), clean)
-	@make $(MAKE_FLAGS) -C Product/build -f module.demo.Makefile cleanall MAKE_TARGET=demo
-	@make $(MAKE_FLAGS) -C Product/build -f user.demo.Makefile cleanall MAKE_TARGET=demo
+	$(MLOG)make $(MAKE_FLAGS) -C Product/build -f module.demo.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=demo
+	$(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.demo.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=demo
 else ifeq ($(OPT), install)
-	@make $(MAKE_FLAGS) -C Product/build -f module.demo.Makefile install DIR=$(DIR) MAKE_TARGET=demo
-	@make $(MAKE_FLAGS) -C Product/build -f user.demo.Makefile install DIR=$(DIR) MAKE_TARGET=demo
+	$(MLOG)make $(MAKE_FLAGS) -C Product/build -f module.demo.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=demo
+	$(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.demo.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=demo
 else
-	@make all $(MAKE_FLAGS) -C Product/build -f module.demo.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=demo
-	@make all $(MAKE_FLAGS) -C Product/build -f user.demo.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=demo
+	$(MLOG)make all $(MAKE_FLAGS) -C Product/build -f module.demo.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=demo
+	$(MLOG)make all $(MAKE_FLAGS) -C Product/build -f user.demo.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=demo
 endif	

 conntrack:
 ifeq ($(OPT), clean)
-	@make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.api.Makefile cleanall MAKE_TARGET=conntrack
-	@make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.demoA.Makefile cleanall MAKE_TARGET=demoA
-	@make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.test.Makefile cleanall MAKE_TARGET=test
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.api.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=conntrack
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.demoA.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=demoA
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.test.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=test
 else ifeq ($(OPT), install)
-	@make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.api.Makefile install DIR=$(DIR) MAKE_TARGET=conntrack
-	@make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.demoA.Makefile install DIR=$(DIR) MAKE_TARGET=demoA
-	@make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.test.Makefile install DIR=$(DIR) MAKE_TARGET=conntrack
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.api.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=conntrack
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.demoA.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=demoA
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.conntrack.test.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=conntrack
 else
-	@make all $(MAKE_FLAGS) -C Platform/build -f module.conntrack.api.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=conntrack
-	@make all $(MAKE_FLAGS) -C Platform/build -f module.conntrack.demoA.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=demoA
-	@make all $(MAKE_FLAGS) -C Platform/build -f module.conntrack.test.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=test
+	$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f module.conntrack.api.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=conntrack
+	$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f module.conntrack.demoA.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=demoA
+	$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f module.conntrack.test.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=test
 endif

 netlink:
 ifeq ($(OPT), clean)
-	@make $(MAKE_FLAGS) -C Platform/build -f module.cfgrcv.Makefile cleanall MAKE_TARGET=cfgrcv
-	@make $(MAKE_FLAGS) -C Platform/build -f module.pdelivery.Makefile cleanall MAKE_TARGET=pdeliv	
-	@make $(MAKE_FLAGS) -C Platform/build -f user.cfg2kernel.Makefile cleanall MAKE_TARGET=cfg2kernel	
-	@make $(MAKE_FLAGS) -C Platform/build -f user.pdeliv_u.Makefile cleanall MAKE_TARGET=pdeliv_u
-	@make $(MAKE_FLAGS) -C Platform/build -f user.netlink_uapi.Makefile cleanall MAKE_TARGET=netlink_uapi
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.cfgrcv.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=cfgrcv
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.pdelivery.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=pdeliv	
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.cfg2kernel.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=cfg2kernel	
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.pdeliv_u.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=pdeliv_u
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.netlink_uapi.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=netlink_uapi
 else ifeq ($(OPT), install)
-	@make $(MAKE_FLAGS) -C Platform/build -f module.cfgrcv.Makefile install DIR=$(DIR) MAKE_TARGET=cfgrcv
-	@make $(MAKE_FLAGS) -C Platform/build -f module.pdelivery.Makefile install DIR=$(DIR) MAKE_TARGET=pdeliv
-	@make $(MAKE_FLAGS) -C Platform/build -f user.netlink_uapi.Makefile install DIR=$(DIR) MAKE_TARGET=netlink_uapi
-	@make $(MAKE_FLAGS) -C Platform/build -f user.cfg2kernel.Makefile install DIR=$(DIR) MAKE_TARGET=cfg2kernel	
-	@make $(MAKE_FLAGS) -C Platform/build -f user.pdeliv_u.Makefile install DIR=$(DIR) MAKE_TARGET=pdeliv_u
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.cfgrcv.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=cfgrcv
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f module.pdelivery.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=pdeliv
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.netlink_uapi.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=netlink_uapi
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.cfg2kernel.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=cfg2kernel	
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.pdeliv_u.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=pdeliv_u
 else
-	@make all $(MAKE_FLAGS) -C Platform/build -f module.cfgrcv.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=cfgrcv
-	@make all $(MAKE_FLAGS) -C Platform/build -f module.pdelivery.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=pdeliv
-	@make all $(MAKE_FLAGS) -C Platform/build -f user.netlink_uapi.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=netlink_uapi	
-	@make all $(MAKE_FLAGS) -C Platform/build -f user.cfg2kernel.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=cfg2kernel	
-	@make all $(MAKE_FLAGS) -C Platform/build -f user.pdeliv_u.Makefile DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=pdeliv_u
+	$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f module.cfgrcv.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=cfgrcv
+	$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f module.pdelivery.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=pdeliv
+	$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.netlink_uapi.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=netlink_uapi	
+	$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.cfg2kernel.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=cfg2kernel	
+	$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.pdeliv_u.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=pdeliv_u
 endif