[build] config LOG_OUTPUT_APP when CERT_LOG is enabled (#2315)

This commit is contained in:
rongli
2017-12-02 01:59:26 +00:00
committed by Jonathan Hui
parent 935d2d07c9
commit 9270cb4377
4 changed files with 32 additions and 51 deletions
+1 -19
View File
@@ -49,25 +49,7 @@ configure_OPTIONS = \
--enable-linker-map \
$(NULL)
ifeq ($(CERT_LOG),1)
configure_OPTIONS += --enable-cert-log
endif
ifeq ($(COMMISSIONER),1)
configure_OPTIONS += --enable-commissioner
endif
ifeq ($(JOINER),1)
configure_OPTIONS += --enable-joiner
endif
ifeq ($(DHCP6_SERVER),1)
configure_OPTIONS += --enable-dhcp6-server
endif
ifeq ($(DHCP6_CLIENT),1)
configure_OPTIONS += --enable-dhcp6-client
endif
include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/common-switches.mk
TopSourceDir := $(dir $(shell readlink $(firstword $(MAKEFILE_LIST))))..
AbsTopSourceDir := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))..
+1 -3
View File
@@ -79,9 +79,7 @@ COMMONCFLAGS := \
-I$(CONFIG_FILE_PATH) \
$(NULL)
ifeq ($(CERT_LOG),1)
COMMONCFLAGS += -DOPENTHREAD_CONFIG_LOG_OUTPUT=OPENTHREAD_CONFIG_LOG_OUTPUT_APP
else
ifneq ($(CERT_LOG),1)
COMMONCFLAGS += -DOPENTHREAD_CONFIG_LOG_OUTPUT=OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED
endif
+29 -29
View File
@@ -41,6 +41,35 @@ RM_F := rm -f
BuildJobs ?= 10
# If the user has asserted COVERAGE, alter the configuration options
# accordingly.
configure_OPTIONS = \
--enable-application-coap \
--enable-border-router \
--enable-cert-log \
--enable-child-supervision \
--enable-cli-app=all \
--enable-commissioner \
--enable-dhcp6-client \
--enable-dhcp6-server \
--enable-diag \
--enable-dns-client \
--enable-jam-detection \
--enable-joiner \
--enable-legacy \
--enable-mac-filter \
--enable-mtd-network-diagnostic \
--enable-ncp-app=all \
--enable-raw-link-api \
--enable-service \
--enable-tmf-proxy \
--with-examples=posix \
--with-ncp-bus=uart \
$(NULL)
include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/common-switches.mk
TopSourceDir := $(dir $(shell readlink $(firstword $(MAKEFILE_LIST))))..
AbsTopSourceDir := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))..
@@ -86,35 +115,6 @@ AbsTopResultDir = $(PWD)/$(TopResultDir)
TargetTuple = $(shell ${AbsTopSourceDir}/third_party/nlbuild-autotools/repo/autoconf/config.guess | sed -e 's/[[:digit:].]*$$//g')
# If the user has asserted COVERAGE, alter the configuration options
# accordingly.
configure_OPTIONS = \
--enable-application-coap \
--enable-border-router \
--enable-cert-log \
--enable-child-supervision \
--enable-cli-app=all \
--enable-commissioner \
--enable-dhcp6-client \
--enable-dhcp6-server \
--enable-diag \
--enable-dns-client \
--enable-jam-detection \
--enable-joiner \
--enable-legacy \
--enable-mac-filter \
--enable-mtd-network-diagnostic \
--enable-ncp-app=all \
--enable-raw-link-api \
--enable-service \
--enable-tmf-proxy \
--with-examples=posix \
--with-ncp-bus=uart \
$(NULL)
include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/common-switches.mk
ifndef BuildJobs
BuildJobs := $(shell getconf _NPROCESSORS_ONLN)
endif
+1
View File
@@ -31,6 +31,7 @@ configure_OPTIONS += --enable-border-router
endif
ifeq ($(CERT_LOG),1)
COMMONCFLAGS += -DOPENTHREAD_CONFIG_LOG_OUTPUT=OPENTHREAD_CONFIG_LOG_OUTPUT_APP
configure_OPTIONS += --enable-cert-log
endif