From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 06/12] mk: split install rule
Date: Thu, 3 Dec 2015 06:02:03 +0100 [thread overview]
Message-ID: <1449118929-19962-7-git-send-email-thomas.monjalon@6wind.com> (raw)
In-Reply-To: <1449118929-19962-1-git-send-email-thomas.monjalon@6wind.com>
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 <mario.alfredo.c.arevalo@intel.com>
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
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 6a7aedd..509b50e 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=$(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 $(RTE_SDK)/{mk,scripts} $(DESTDIR)$(sdkdir)
$(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir))
- $(Q)cp -a $(BUILD_DIR)/.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 9fdecf4..ce6b0fc 100644
--- a/mk/rte.sdkroot.mk
+++ b/mk/rte.sdkroot.mk
@@ -96,6 +96,8 @@ test fast_test ring_test mempool_test perf_test coverage:
.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
--
2.5.2
next prev parent reply other threads:[~2015-12-03 5:03 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 3:57 [dpdk-dev] [PATCH 00/10] standard make install Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 01/10] mk: remove multi-target install Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 02/10] mk: move installation procedure in install rule Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 03/10] mk: install a standard cutomizable tree Thomas Monjalon
2015-12-02 10:27 ` Panu Matilainen
2015-12-02 11:25 ` Thomas Monjalon
2015-12-02 12:54 ` Panu Matilainen
2015-12-02 13:05 ` Thomas Monjalon
2015-12-02 13:29 ` Panu Matilainen
2015-12-02 3:57 ` [dpdk-dev] [PATCH 04/10] mk: introduce new install syntax Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 05/10] mk: split install rule Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 06/10] mk: install kernel modules Thomas Monjalon
2015-12-02 9:53 ` Panu Matilainen
2015-12-02 10:09 ` Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 07/10] mk: install binding tool in sbin directory Thomas Monjalon
2015-12-02 9:58 ` Panu Matilainen
2015-12-02 3:57 ` [dpdk-dev] [PATCH 08/10] mk: install doc Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 09/10] mk: install examples Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 10/10] app/proc_info: rename binary with prefix Thomas Monjalon
2015-12-02 7:44 ` [dpdk-dev] [PATCH 00/10] standard make install Panu Matilainen
2015-12-02 9:25 ` Thomas Monjalon
2015-12-02 9:47 ` Panu Matilainen
2015-12-02 10:07 ` Thomas Monjalon
2015-12-03 5:01 ` [dpdk-dev] [PATCH v2 00/12] " Thomas Monjalon
2015-12-03 5:01 ` [dpdk-dev] [PATCH v2 01/12] mk: remove testall Thomas Monjalon
2015-12-03 5:01 ` [dpdk-dev] [PATCH v2 02/12] mk: remove multi-target install Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 03/12] mk: move installation procedure in install rule Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 04/12] mk: install a standard cutomizable tree Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 05/12] mk: introduce new install syntax Thomas Monjalon
2015-12-03 5:02 ` Thomas Monjalon [this message]
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 07/12] mk: install kernel modules Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 08/12] mk: install binding tool in sbin directory Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 09/12] mk: install doc Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 10/12] mk: install examples Thomas Monjalon
2015-12-03 13:19 ` Panu Matilainen
2015-12-03 13:32 ` Thomas Monjalon
2015-12-03 13:35 ` Panu Matilainen
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 11/12] app/proc_info: rename binary with prefix Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 12/12] pkg: update RPM with standard install Thomas Monjalon
2015-12-03 10:57 ` [dpdk-dev] [PATCH v2 00/12] standard make install Bruce Richardson
2015-12-03 11:02 ` Thomas Monjalon
2015-12-03 11:06 ` Thomas Monjalon
2015-12-03 11:10 ` Bruce Richardson
2015-12-03 11:07 ` Bruce Richardson
2015-12-03 13:26 ` Panu Matilainen
2015-12-03 13:34 ` Thomas Monjalon
2015-12-03 15:52 ` Arevalo, Mario Alfredo C
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 00/13] " Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 01/13] mk: remove testall Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 02/13] mk: remove multi-target install Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 03/13] mk: move installation procedure in install rule Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 04/13] mk: install a standard cutomizable tree Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 05/13] mk: introduce new install syntax Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 06/13] mk: split install rule Thomas Monjalon
2015-12-07 23:22 ` Arevalo, Mario Alfredo C
2015-12-07 23:51 ` Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 07/13] mk: install kernel modules Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 08/13] mk: install binding tool in sbin directory Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 09/13] mk: install doc Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 10/13] mk: install examples Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 11/13] app/proc_info: rename binary with prefix Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 12/13] pkg: update RPM with standard install Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 13/13] maintainers: take responsibility for build system Thomas Monjalon
2015-12-04 9:40 ` Olivier MATZ
2015-12-03 15:31 ` [dpdk-dev] [PATCH v3 00/13] standard make install Bruce Richardson
2015-12-03 17:05 ` Thomas Monjalon
2015-12-06 15:00 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449118929-19962-7-git-send-email-thomas.monjalon@6wind.com \
--to=thomas.monjalon@6wind.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).