From patchwork Fri Oct 30 01:47:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Carrillo X-Patchwork-Id: 8302 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 3A8C38F9C; Fri, 30 Oct 2015 02:47:48 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 122FF8E6A for ; Fri, 30 Oct 2015 02:47:43 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 29 Oct 2015 18:47:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,217,1444719600"; d="scan'208";a="590712290" Received: from mcarril6-mobl.amr.corp.intel.com (HELO mcarril6-mobl.zpn.intel.com) ([10.219.25.105]) by FMSMGA003.fm.intel.com with ESMTP; 29 Oct 2015 18:47:21 -0700 From: Mario Carrillo To: dev@dpdk.org Date: Thu, 29 Oct 2015 19:47:35 -0600 Message-Id: <1446169656-19818-10-git-send-email-mario.alfredo.c.arevalo@intel.com> X-Mailer: git-send-email 2.6.1.120.g24a00ef In-Reply-To: <1446169656-19818-1-git-send-email-mario.alfredo.c.arevalo@intel.com> References: <1442608390-12537-1-git-send-email-mario.alfredo.c.arevalo@intel.com> <1446169656-19818-1-git-send-email-mario.alfredo.c.arevalo@intel.com> Subject: [dpdk-dev] [PATCH v5 09/10] mk: Add new install rule 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" If "T" variable is defined, the installation process will have the current behaviour, else install rule will be called. Signed-off-by: Mario Carrillo --- mk/rte.sdkinstall.mk | 12 +++++++++++- mk/rte.sdkroot.mk | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 24aa5a5..3331610 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -40,7 +40,6 @@ endif # target name or a name containing jokers "*". Example: # x86_64-native-*-gcc ifndef T -T=* ifneq (,$(wildcard $(RTE_OUTPUT)/.config)) RTE_PREFIX ?= /usr/local INCLUDE_DIR ?= $(RTE_PREFIX)/include/dpdk @@ -191,6 +190,17 @@ install-sdk: install-headers .PHONY: install-fhs install-fhs: install-lib install-bin install-doc install-mod # +# if "T" var is defined, mbuild rule will be called, else +# install-fhs rule will be called. +# +.PHONY: install +install: +ifdef T +install: mbuild +else +install: install-fhs +endif +# # uninstall: remove all built sdk # UNINSTALL_TARGETS := $(addsuffix _uninstall,\ diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index 1b619b7..2f8f64a 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -97,9 +97,9 @@ test fast_test ring_test mempool_test perf_test coverage: testall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktestall.mk $@ -.PHONY: mbuild install-headers install-bin install-lib install-mod \ +.PHONY: mbuild install install-headers install-bin install-lib install-mod \ install-doc install-sdk install-fhs uninstall -mbuild install-headers install-bin install-lib install-mod install-doc \ +mbuild install install-headers install-bin install-lib install-mod install-doc \ install-sdk install-fhs uninstall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@