X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=mk%2Frte.vars.mk;h=b51006b817e290ea9926090db5a7f845a3e7e389;hb=b2c3f15f84262c537197a86409335a8751fb3f6b;hp=d2f01b6499c91ad579cd012fcc049eb358cd4213;hpb=0cd854eef5e12f3f6333f69463a234f968661723;p=dpdk.git diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk index d2f01b6499..b51006b817 100644 --- a/mk/rte.vars.mk +++ b/mk/rte.vars.mk @@ -46,6 +46,9 @@ endif # define Q to '@' or not. $(Q) is used to prefix all shell commands to # be executed silently. Q=@ +ifeq '$V' '0' +override V= +endif ifdef V ifeq ("$(origin V)", "command line") Q= @@ -61,29 +64,10 @@ ifneq ($(BUILDING_RTE_SDK),) RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) - RTE_TARGET := $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN) RTE_SDK_BIN := $(RTE_OUTPUT) - RTE_BUILD_SHARED_LIB := $(CONFIG_RTE_BUILD_SHARED_LIB:"%"=%) - ifeq ($(RTE_BUILD_SHARED_LIB),) - RTE_BUILD_SHARED_LIB := n - endif - RTE_BUILD_COMBINE_LIBS := $(CONFIG_RTE_BUILD_COMBINE_LIBS:"%"=%) - ifeq ($(RTE_BUILD_COMBINE_LIBS),) - RTE_BUILD_COMBINE_LIBS := n - endif -endif - -RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%) -ifeq ($(RTE_LIBNAME),) -RTE_LIBNAME := intel_dpdk endif -# RTE_TARGET is deducted from config when we are building the SDK. -# Else, when building an external app, RTE_TARGET must be specified -# by the user. -ifeq ($(RTE_TARGET),) -$(error RTE_TARGET is not defined) -endif +RTE_TARGET ?= $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN) ifeq ($(BUILDING_RTE_SDK),) # if we are building an external app/lib, include internal/rte.extvars.mk that will @@ -112,7 +96,7 @@ ifeq ($(RTE_TOOLCHAIN),) $(error RTE_TOOLCHAIN is not defined) endif -# can be overriden by make command line or exported environment variable +# can be overridden by make command line or exported environment variable RTE_KERNELDIR ?= /lib/modules/$(shell uname -r)/build export RTE_TARGET @@ -121,6 +105,11 @@ export RTE_MACHINE export RTE_EXEC_ENV export RTE_TOOLCHAIN +# developer build automatically enabled in a git tree +ifneq ($(wildcard $(RTE_SDK)/.git),) +RTE_DEVEL_BUILD ?= y +endif + # SRCDIR is the current source directory ifdef S SRCDIR := $(abspath $(RTE_SRCDIR)/$(S))