From patchwork Wed Mar 4 17:13:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wiles, Keith" X-Patchwork-Id: 3849 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 1225C5A7A; Wed, 4 Mar 2015 18:13:20 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id D344B5A76 for ; Wed, 4 Mar 2015 18:13:17 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 04 Mar 2015 09:13:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,688,1418112000"; d="scan'208";a="693932234" Received: from unknown (HELO rkwiles-desk.ger.corp.intel.com) ([10.255.41.81]) by orsmga002.jf.intel.com with ESMTP; 04 Mar 2015 09:13:15 -0800 From: Keith Wiles To: dev@dpdk.org Date: Wed, 4 Mar 2015 11:13:09 -0600 Message-Id: <1425489189-43477-1-git-send-email-keith.wiles@intel.com> X-Mailer: git-send-email 2.3.0 Subject: [dpdk-dev] [PATCH] Move mk/rte.extvars.mk to mk/internal/rte.extvars.mk X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- mk/internal/rte.extvars.mk | 81 ++++++++++++++++++++++++++++++++++++++++++++++ mk/rte.extvars.mk | 81 ---------------------------------------------- mk/rte.vars.mk | 4 +-- 3 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 mk/internal/rte.extvars.mk delete mode 100644 mk/rte.extvars.mk diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk new file mode 100644 index 0000000..3e5a990 --- /dev/null +++ b/mk/internal/rte.extvars.mk @@ -0,0 +1,81 @@ +# 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 3e5a990..0000000 --- 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 d5b36be..d2f01b6 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)