From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id BA91E8D99 for ; Tue, 1 Dec 2015 20:38:56 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 01 Dec 2015 11:38:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,370,1444719600"; d="scan'208";a="832078484" Received: from mcarril6-mobl.zpn.intel.com ([10.219.16.33]) by orsmga001.jf.intel.com with ESMTP; 01 Dec 2015 11:38:54 -0800 From: Mario Carrillo To: dev@dpdk.org Date: Tue, 1 Dec 2015 13:39:03 -0600 Message-Id: <1448998753-26599-2-git-send-email-mario.alfredo.c.arevalo@intel.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1448998753-26599-1-git-send-email-mario.alfredo.c.arevalo@intel.com> References: <1442608390-12537-1-git-send-email-mario.alfredo.c.arevalo@intel.com> <1448998753-26599-1-git-send-email-mario.alfredo.c.arevalo@intel.com> Cc: jos.c.venegas.munoz@intel.com Subject: [dpdk-dev] [PATCH v8 01/11] mk: Add rule for installing headers 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: Tue, 01 Dec 2015 19:38:57 -0000 Add hierarchy-file support to the DPDK headers, when invoking "make install-headers" headers will be installed in: $(DESTDIR)/$(includedir) where includedir=$(prefix)/include/dpdk and prefix=/usr/local by default, you can override "prefix" and "includedir" vars. This hierarchy is based on: http://www.freedesktop.org/software/systemd/man/file-hierarchy.html and variables are based on: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html https://www.gnu.org/prep/standards/html_node/DESTDIR.html Signed-off-by: Mario Carrillo --- mk/rte.sdkinstall.mk | 22 +++++++++++++++++++++- mk/rte.sdkroot.mk | 4 ++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 86c98a5..a4a01cf 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -41,6 +41,11 @@ endif # x86_64-native-*-gcc ifndef T T=* +ifneq (,$(wildcard $(RTE_OUTPUT)/.config)) +prefix ?= /usr/local +includedir ?= $(prefix)/include/dpdk +HSLINKS := $(shell find $(RTE_OUTPUT)/include/ -name *.h) +endif endif # @@ -72,7 +77,22 @@ install: $(INSTALL_TARGETS) echo "Using local configuration"; \ fi $(Q)$(MAKE) all O=$(BUILD_DIR)/$* - +# +# install headers in /usr/local/include/dpdk by default +# "prefix" and "includedir" vars can be overridden. +# +.PHONY: install-headers +install-headers: + @echo ================== Installing headers; + @if [ ! -z "${HSLINKS}" ]; then \ + for HSLINK in ${HSLINKS}; do \ + HEADER=$$(readlink -f $$HSLINK); \ + HEADER_DIR=$$(dirname $$HSLINK | sed 's/.*include\/*//'); \ + [ -d $(DESTDIR)/$(includedir)/$$HEADER_DIR ] || mkdir -p $(DESTDIR)/$(includedir)/$$HEADER_DIR; \ + cp -rf $$HEADER ${DESTDIR}/${includedir}/$$HEADER_DIR; \ + echo installing: $$HEADER; \ + done \ + fi # # uninstall: remove all built sdk # diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index e8423b0..8477a2b 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -97,8 +97,8 @@ test fast_test ring_test mempool_test perf_test coverage: testall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktestall.mk $@ -.PHONY: install uninstall -install uninstall: +.PHONY: install install-headers uninstall +install install-headers uninstall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ .PHONY: doc help -- 2.6.3