From 7848cfbc5ea995834ba45b46738b543aa63c6a05 Mon Sep 17 00:00:00 2001 From: Feng-msft Date: Mon, 3 Jul 2023 15:58:48 +0800 Subject: [PATCH] Merge pull request #134 from FengPan-Frank/fenpan_dialout_rename Rename --enable-dialout option into ENABLE_DIALOUT to follow the convention --- Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 65ddac0b..75d5402f 100644 --- a/Makefile +++ b/Makefile @@ -26,17 +26,15 @@ ifeq ($(ENABLE_NATIVE_WRITE),y) BLD_TAGS := $(BLD_TAGS) gnmi_native_write endif -# Define a variable that holds the value of the `--enable-dialout` option -ENABLE_DIALOUT := $(filter --enable-dialout=%,$(MAKEFLAGS)) -ENABLE_DIALOUT_VALUE := $(subst --enable-dialout=,,$(ENABLE_DIALOUT)) -ifeq ($(strip $(ENABLE_DIALOUT_VALUE)),) -ENABLE_DIALOUT_VALUE = 1 -endif - ifneq ($(BLD_TAGS),) BLD_FLAGS := -tags "$(strip $(BLD_TAGS))" endif +ENABLE_DIALOUT_VALUE := 1 +ifeq ($(ENABLE_DIALOUT),n) +ENABLE_DIALOUT_VALUE = 0 +endif + GO_DEPS := vendor/.done PATCHES := $(wildcard patches/*.patch) PATCHES += $(shell find $(MGMT_COMMON_DIR)/patches -type f)