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 1CBAB8DAC for ; Thu, 1 Oct 2015 02:11:52 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 30 Sep 2015 17:11:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,614,1437462000"; d="scan'208";a="800956959" Received: from mcarril6-mobl.zpn.intel.com ([10.219.17.82]) by fmsmga001.fm.intel.com with ESMTP; 30 Sep 2015 17:11:51 -0700 From: Mario Carrillo To: dev@dpdk.org Date: Wed, 30 Sep 2015 19:11:46 -0500 Message-Id: <1443658313-11045-2-git-send-email-mario.alfredo.c.arevalo@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1443658313-11045-1-git-send-email-mario.alfredo.c.arevalo@intel.com> References: <1442608390-12537-1-git-send-email-mario.alfredo.c.arevalo@intel.com> <1443658313-11045-1-git-send-email-mario.alfredo.c.arevalo@intel.com> Cc: pmatilai@redhat.com‎ Subject: [dpdk-dev] [PATCH v3 1/8] 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: Thu, 01 Oct 2015 00:11:53 -0000 Add hierarchy-file support to the DPDK headers, when invoking "make install-headers" headers will be installed in: $(DESTDIR)/$(INCLUDE_DIR) where INCLUDE_DIR=/usr/include/dpdk by default, you can override INCLUDE_DIR var. This hierarchy is based on: http://www.freedesktop.org/software/systemd/man/file-hierarchy.html Signed-off-by: Mario Carrillo --- mk/rte.sdkinstall.mk | 19 ++++++++++++++++++- mk/rte.sdkroot.mk | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 86c98a5..0d5cbcf 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -40,7 +40,12 @@ endif # target name or a name containing jokers "*". Example: # x86_64-native-*-gcc ifndef T +ifeq (,$(wildcard $(BUILD_DIR)/build/.config)) T=* +else +INCLUDE_DIR ?= /usr/include/dpdk +HSLINKS := $(wildcard $(RTE_OUTPUT)/include/*) +endif endif # @@ -72,7 +77,19 @@ install: $(INSTALL_TARGETS) echo "Using local configuration"; \ fi $(Q)$(MAKE) all O=$(BUILD_DIR)/$* - +# +# install headers in /usr/include/dpdk by default +# INCLUDE_DIR can be overridden. +# +.PHONY: install-headers +install-headers: + @echo ================== Installing headers; + @[ -d $(DESTDIR)/$(INCLUDE_DIR) ] || mkdir -p $(DESTDIR)/$(INCLUDE_DIR) + @for HSLINK in ${HSLINKS}; do \ + HEADER=$$(readlink -f $$HSLINK); \ + cp -rf $$HEADER ${DESTDIR}/${INCLUDE_DIR}; \ + echo installing: $$HEADER; \ + done # # 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.1.0