From patchwork Wed Dec 2 03:57:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 9235 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 968128E79; Wed, 2 Dec 2015 04:59:24 +0100 (CET) Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 304258E74 for ; Wed, 2 Dec 2015 04:59:24 +0100 (CET) Received: by wmww144 with SMTP id w144so39975404wmw.0 for ; Tue, 01 Dec 2015 19:59:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ekJtuLNwr1lXvcWavKDTpjb1+jXOSE5wxcNgOvXGmrY=; b=h/XY3M+hioKm2Y5n9kFuYfWdzc06BGOc9R3mqtHfa1WFBwfsGi7w3KJWC8+DVTuL28 KkxPyYdIVTAN0Day72mwIBN6J47U2sf5b/zx/qzXzTf4Oa2IiQIsseJGFzJnnwODTocH iP6ZmTHvoBE11LDh8Ea2sEV0S+jrHftxjuiR4cPDdE1aqD3exisQ3G80R7Y9NdEuNoOE 6sBIk1ESBSbJmPStIksizQ99+DA1Ypv/6YSbkGiKHOuSkK/491a3Y6y7sX31Ukf274Bv Aw9hwcL0xjVC5dq+MFx2IclJ1kN/ttvrYS9pxvK8LOyaBZ0XbA2SmLszq+FRPHiFqaVe fA+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ekJtuLNwr1lXvcWavKDTpjb1+jXOSE5wxcNgOvXGmrY=; b=ShFjsAJbJ4QbhU6IS7z+f2MWs1O08VJ9RRIwaTN6ybR54T5lAunj+Um3kIFsr6XC7S WuKUpeUsUx4uucKjgmV8rlA2fFXfSjyIL+B+YSh6HQJz3TrEyfiahJ5z1IunavTpFZDN CP3HPs0DV2b1XF4235A/+6A/FzhnVEVhOxN11bomVl+SkKFSP4AvScnmEV4oDA6SkgqT l4DXlvS5MUKQlNxwF5chX7pY22nUt2EzKNvrgm7PqnCsoo0jqqDUg3lWvmD4o+Khwsns L88eVwTX9md2sSAQNpNX+t88NtsKB+iyy7AwMAWVqCx/F264MMoQpjnBa0S2goggICaN lhIA== X-Gm-Message-State: ALoCoQmdsH7dSJ2e3XGSYkNZrlNGtlU/2QwsoEzx865WUG8ormoxX3ut2EsiemD9XpmkpbHsGpaO X-Received: by 10.194.175.194 with SMTP id cc2mr1476239wjc.121.1449028764077; Tue, 01 Dec 2015 19:59:24 -0800 (PST) Received: from XPS13.ibrowse.com ([93.158.52.3]) by smtp.gmail.com with ESMTPSA id h5sm783942wjz.21.2015.12.01.19.59.23 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 Dec 2015 19:59:23 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Wed, 2 Dec 2015 04:57:51 +0100 Message-Id: <1449028676-19232-6-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1449028676-19232-1-git-send-email-thomas.monjalon@6wind.com> References: <1449028676-19232-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH 05/10] mk: split 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" Provides new sub-rules to install runtime and sdk separately. The build directory must be changed from BUILD_DIR to O in install rules to avoid a bad recursive effect (O being BUILD_DIR being O + T). Suggested-by: Mario Carrillo Signed-off-by: Thomas Monjalon --- mk/rte.sdkinstall.mk | 18 ++++++++++++------ mk/rte.sdkroot.mk | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 9b4303a..5585974 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -88,24 +88,30 @@ ifeq '$(DESTDIR)$(if $T,,+)' '' @echo Installation cannot run with T defined and DESTDIR undefined else @echo ================== Installing $(DESTDIR)$(prefix)/ + $(Q)$(MAKE) O=$(BUILD_DIR) install-runtime + $(Q)$(MAKE) O=$(BUILD_DIR) install-sdk + @echo Installation in $(DESTDIR)$(prefix)/ complete +endif + +install-runtime: $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) - $(Q)cp -a $(BUILD_DIR)/lib/* $(DESTDIR)$(libdir) + $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir) $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) - $(Q)tar -cf - -C $(BUILD_DIR) app --exclude 'app/*.map' \ + $(Q)tar -cf - -C $O app --exclude 'app/*.map' \ --exclude 'app/cmdline*' --exclude app/test \ --exclude app/testacl --exclude app/testpipeline | \ tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ --keep-newer-files --warning=no-ignore-newer $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir) + +install-sdk: $(Q)$(call rte_mkdir, $(DESTDIR)$(includedir)) - $(Q)tar -chf - -C $(BUILD_DIR) include | \ + $(Q)tar -chf - -C $O include | \ tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ --keep-newer-files --warning=no-ignore-newer $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) - $(Q)cp -a $(BUILD_DIR)/.config $(DESTDIR)$(sdkdir) + $(Q)cp -a $O/.config $(DESTDIR)$(sdkdir) $(Q)cp -a $(RTE_SDK)/{mk,scripts} $(DESTDIR)$(sdkdir) $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(sdkdir)/include) $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(sdkdir)/lib) - @echo Installation in $(DESTDIR)$(prefix)/ complete -endif diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index 18180fa..dbb7bce 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -100,6 +100,8 @@ testall: .PHONY: install install: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ +install-%: + $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ .PHONY: doc help doc: doc-all