From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 8D31D8E86 for ; Thu, 3 Dec 2015 14:47:05 +0100 (CET) Received: by wmww144 with SMTP id w144so22803213wmw.0 for ; Thu, 03 Dec 2015 05:47:05 -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=N4Shen1XWH67kDl3cAVtwnH/9ELZJNAJIDClVcovfk0=; b=kMrzlK7pl+oGvOQaeDMNQ6DZcDqPHjR9O3/rka5vjlCRCYBlu2uog+RWU3vJa6CfVC Xu4q2ayQEU0um9XrGth2Sud11j1aiJiiy/NnANo+rUpzZpx5xPlOYZJ4wE/2LpSrqWgx xVV3F70gJS7YVKI5kyiw3644d1QwCSusJpvlJirXQNhq0N/LDZWLr6CAVwEd1TN0bKEG /jzeIEC8aAYElwGgD8CSLFAKMs4z6hOO4+AqRLLG73Bi1B8e3tKKythScy0h9OmO3cWJ fDfeA9Y7Ny1NbVoyKSc0ksZ/K+SiZuOFj5cG2vnfgDWMPSPp8d34XVij/4f4bbB0GBIJ PjFQ== 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=N4Shen1XWH67kDl3cAVtwnH/9ELZJNAJIDClVcovfk0=; b=YSrMV476hWzW5MB2H7bip8TRNAJIT//oZoc767XZ75ltt2DwkpQS8FVtRdNFYBlFHM XrPlKLrP3PdVicPG64DJjKB19JPdThB5ZWrOho88Xv9z4P7HWcjB56Ak/I5lMHP6J6Qj jx2D19mM6p3F7UWcjMKy8spjp9W/yoe2u+ZHBlDULgTxNFb/pxw7cHg7tcflfFfCQp4i TNZFgfS7ZFpn1KEk42TJFJCJL0g0ZmeOKmXLOOeJyFq4nvvYeZi5j38Q26SClRQAE3rY uMlxZhq0xE7xPGJFerT/Zkec7GueBKGJlkeWjjCscqEPza2YyNG09gNVAl9/xky1nLBO jVpQ== X-Gm-Message-State: ALoCoQlHE4MmCcVD3tgBpWoApI+dAps57TKG3BnA5Xhd4DCOnL98BSdkKXJC+dQcOjzFYrbJebta X-Received: by 10.194.222.104 with SMTP id ql8mr12755459wjc.157.1449150424998; Thu, 03 Dec 2015 05:47:04 -0800 (PST) Received: from XPS13.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id k133sm8063912wmg.18.2015.12.03.05.47.03 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Dec 2015 05:47:04 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Thu, 3 Dec 2015 14:45:33 +0100 Message-Id: <1449150340-21984-7-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1449150340-21984-1-git-send-email-thomas.monjalon@6wind.com> References: <1449118929-19962-1-git-send-email-thomas.monjalon@6wind.com> <1449150340-21984-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v3 06/13] 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: , X-List-Received-Date: Thu, 03 Dec 2015 13:47:05 -0000 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 Acked-by: Panu Matilainen --- 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 dc57baf..ec093d3 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -93,25 +93,31 @@ ifeq ($(DESTDIR)$(if $T,,+),) @echo Installation cannot run with T defined and DESTDIR undefined else @echo ================== Installing $(DESTDIR)$(prefix)/ + $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-runtime + $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-sdk + @echo Installation in $(DESTDIR)$(prefix)/ complete +endif + +install-runtime: $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) - $(Q)cp -a $(RTE_OUTPUT)/lib/* $(DESTDIR)$(libdir) + $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir) $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) - $(Q)tar -cf - -C $(RTE_OUTPUT) 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 $(RTE_OUTPUT) 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 $(RTE_SDK)/{mk,scripts} $(DESTDIR)$(sdkdir) $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)) - $(Q)cp -a $(RTE_OUTPUT)/.config $(DESTDIR)$(targetdir) + $(Q)cp -a $O/.config $(DESTDIR)$(targetdir) $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) - @echo Installation in $(DESTDIR)$(prefix)/ complete -endif diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index 533afe9..2424dce 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -97,6 +97,8 @@ test fast_test ring_test mempool_test perf_test coverage: install: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_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 -- 2.5.2