X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Frte.vars.mk;h=b51006b817e290ea9926090db5a7f845a3e7e389;hb=1a2d1f62d7ba2b36d031ecf60ad4eb11117c670a;hp=1e874ee34338039595438cf26db094cacb65debc;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git

diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
index 1e874ee343..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,33 +64,15 @@ 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
-  RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%)
-  ifeq ($(RTE_LIBNAME),)
-    RTE_LIBNAME := intel_dpdk
-  endif
 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 rte.extvars.mk that will
+# if we are building an external app/lib, include internal/rte.extvars.mk that will
 # define RTE_OUTPUT, RTE_SRCDIR, RTE_EXTMK, RTE_SDK_BIN, (etc ...)
-include $(RTE_SDK)/mk/rte.extvars.mk
+include $(RTE_SDK)/mk/internal/rte.extvars.mk
 endif
 
 CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_IGB_PMD)
@@ -111,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
@@ -120,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))