From: Keith Wiles Date: Wed, 4 Mar 2015 17:13:09 +0000 (-0600) Subject: mk: move internal file X-Git-Tag: spdx-start~9486 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=0cd854eef5e12f3f6333f69463a234f968661723;p=dpdk.git mk: move internal file Move the rte.extvars.mk to an internal directory and update rte.vars.mk to find the file in the new location. Signed-off-by: Keith Wiles Acked-by: Olivier Matz --- diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk new file mode 100644 index 0000000000..e248d19aed --- /dev/null +++ b/mk/internal/rte.extvars.mk @@ -0,0 +1,79 @@ +# BSD LICENSE +# +# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# +# directory where sources are located +# +ifdef S +ifeq ("$(origin S)", "command line") +RTE_SRCDIR := $(abspath $(S)) +endif +endif +RTE_SRCDIR ?= $(CURDIR) +export RTE_SRCDIR + +# +# Makefile to call once $(RTE_OUTPUT) is created +# +ifdef M +ifeq ("$(origin M)", "command line") +RTE_EXTMK := $(abspath $(M)) +endif +endif +RTE_EXTMK ?= $(RTE_SRCDIR)/Makefile +export RTE_EXTMK + +RTE_SDK_BIN := $(RTE_SDK)/$(RTE_TARGET) + +# +# Output files wil go in a separate directory: default output is +# $(RTE_SRCDIR)/build +# Output dir can be given as command line using "O=" +# +ifdef O +ifeq ("$(origin O)", "command line") +RTE_OUTPUT := $(abspath $(O)) +endif +endif +RTE_OUTPUT ?= $(RTE_SRCDIR)/build +export RTE_OUTPUT + +# if we are building an external application, include SDK +# configuration and include project configuration if any +include $(RTE_SDK_BIN)/.config +ifneq ($(wildcard $(RTE_OUTPUT)/.config),) + include $(RTE_OUTPUT)/.config +endif +# remove double-quotes from config names +RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) +RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) +RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) +RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) diff --git a/mk/rte.extvars.mk b/mk/rte.extvars.mk deleted file mode 100644 index 3e5a99012d..0000000000 --- a/mk/rte.extvars.mk +++ /dev/null @@ -1,81 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# -# directory where sources are located -# -ifdef S -ifeq ("$(origin S)", "command line") -RTE_SRCDIR := $(abspath $(S)) -endif -endif -RTE_SRCDIR ?= $(CURDIR) -export RTE_SRCDIR - -# -# Makefile to call once $(RTE_OUTPUT) is created -# -ifdef M -ifeq ("$(origin M)", "command line") -RTE_EXTMK := $(abspath $(M)) -endif -endif -RTE_EXTMK ?= $(RTE_SRCDIR)/Makefile -export RTE_EXTMK - -RTE_SDK_BIN := $(RTE_SDK)/$(RTE_TARGET) - -# -# Output files wil go in a separate directory: default output is -# $(RTE_SRCDIR)/build -# Output dir can be given as command line using "O=" -# -ifdef O -ifeq ("$(origin O)", "command line") -RTE_OUTPUT := $(abspath $(O)) -endif -endif -RTE_OUTPUT ?= $(RTE_SRCDIR)/build -export RTE_OUTPUT - -# if we are building an external application, include SDK -# configuration and include project configuration if any -include $(RTE_SDK_BIN)/.config -ifneq ($(wildcard $(RTE_OUTPUT)/.config),) - include $(RTE_OUTPUT)/.config -endif -# remove double-quotes from config names -RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) -RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) -RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) -RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) - - diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk index d5b36bedd9..d2f01b6499 100644 --- a/mk/rte.vars.mk +++ b/mk/rte.vars.mk @@ -86,9 +86,9 @@ $(error RTE_TARGET is not defined) endif 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)