From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [RFC PATCH 1/2] pmds: Use relative rather than absolute paths
Date: Thu, 7 May 2015 16:35:50 +0100 [thread overview]
Message-ID: <1431012951-6423-2-git-send-email-bruce.richardson@intel.com> (raw)
In-Reply-To: <1431012951-6423-1-git-send-email-bruce.richardson@intel.com>
In the Makefiles for the PMDs, the paths to the files are often
specified using the full path from $(RTE_SDK) variable. These paths can
be shortened, and make more flexible in case of a future path change by
specifying the paths using $(SRCDIR) instead.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/librte_pmd_e1000/Makefile | 4 ++--
lib/librte_pmd_enic/Makefile | 6 +++---
lib/librte_pmd_fm10k/Makefile | 4 ++--
lib/librte_pmd_i40e/Makefile | 4 ++--
lib/librte_pmd_ixgbe/Makefile | 4 ++--
lib/librte_pmd_vmxnet3/Makefile | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/librte_pmd_e1000/Makefile b/lib/librte_pmd_e1000/Makefile
index 8c8fed8..158bc81 100644
--- a/lib/librte_pmd_e1000/Makefile
+++ b/lib/librte_pmd_e1000/Makefile
@@ -60,10 +60,10 @@ endif
# Add extra flags for base driver files (also known as shared code)
# to disable warnings in them
#
-BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(RTE_SDK)/lib/librte_pmd_e1000/e1000/*.c)))
+BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/e1000/*.c)))
$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-VPATH += $(RTE_SDK)/lib/librte_pmd_e1000/e1000
+VPATH += $(SRCDIR)/e1000
#
# all source are stored in SRCS-y
diff --git a/lib/librte_pmd_enic/Makefile b/lib/librte_pmd_enic/Makefile
index 251a898..bfc0994 100644
--- a/lib/librte_pmd_enic/Makefile
+++ b/lib/librte_pmd_enic/Makefile
@@ -41,12 +41,12 @@ EXPORT_MAP := rte_pmd_enic_version.map
LIBABIVER := 1
-CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_enic/vnic/
-CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_enic/
+CFLAGS += -I$(SRCDIR)/vnic/
+CFLAGS += -I$(SRCDIR)
CFLAGS += -O3
CFLAGS += $(WERROR_FLAGS) -Wno-strict-aliasing
-VPATH += $(RTE_SDK)/lib/librte_pmd_enic/src
+VPATH += $(SRCDIR)/src
#
# all source are stored in SRCS-y
diff --git a/lib/librte_pmd_fm10k/Makefile b/lib/librte_pmd_fm10k/Makefile
index 7516d37..7395933 100644
--- a/lib/librte_pmd_fm10k/Makefile
+++ b/lib/librte_pmd_fm10k/Makefile
@@ -76,10 +76,10 @@ endif
#
# Add extra flags for base driver source files to disable warnings in them
#
-BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(RTE_SDK)/lib/librte_pmd_fm10k/base/*.c)))
+BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))
$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-VPATH += $(RTE_SDK)/lib/librte_pmd_fm10k/base
+VPATH += $(SRCDIR)/base
#
# all source are stored in SRCS-y
diff --git a/lib/librte_pmd_i40e/Makefile b/lib/librte_pmd_i40e/Makefile
index 64bab16..050dd44 100644
--- a/lib/librte_pmd_i40e/Makefile
+++ b/lib/librte_pmd_i40e/Makefile
@@ -75,10 +75,10 @@ endif
CFLAGS_i40e_lan_hmc.o += -Wno-error
endif
-OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(RTE_SDK)/lib/librte_pmd_i40e/i40e/*.c)))
+OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/i40e/*.c)))
$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-VPATH += $(RTE_SDK)/lib/librte_pmd_i40e/i40e
+VPATH += $(SRCDIR)/i40e
#
# all source are stored in SRCS-y
diff --git a/lib/librte_pmd_ixgbe/Makefile b/lib/librte_pmd_ixgbe/Makefile
index fbf6966..e0f8916 100644
--- a/lib/librte_pmd_ixgbe/Makefile
+++ b/lib/librte_pmd_ixgbe/Makefile
@@ -82,10 +82,10 @@ endif
# Add extra flags for base driver files (also known as shared code)
# to disable warnings in them
#
-BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(RTE_SDK)/lib/librte_pmd_ixgbe/ixgbe/*.c)))
+BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/ixgbe/*.c)))
$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-VPATH += $(RTE_SDK)/lib/librte_pmd_ixgbe/ixgbe
+VPATH += $(SRCDIR)/ixgbe
#
# all source are stored in SRCS-y
diff --git a/lib/librte_pmd_vmxnet3/Makefile b/lib/librte_pmd_vmxnet3/Makefile
index fc616c4..48177a3 100644
--- a/lib/librte_pmd_vmxnet3/Makefile
+++ b/lib/librte_pmd_vmxnet3/Makefile
@@ -64,7 +64,7 @@ CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args
endif
-VPATH += $(RTE_SDK)/lib/librte_pmd_vmxnet3/vmxnet3
+VPATH += $(SRCDIR)/vmxnet3
EXPORT_MAP := rte_pmd_vmxnet3_version.map
--
2.1.0
next prev parent reply other threads:[~2015-05-07 15:35 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-07 15:35 [dpdk-dev] [RFC PATCH 0/2] Move PMDs out of lib directory Bruce Richardson
2015-05-07 15:35 ` Bruce Richardson [this message]
2015-05-07 15:45 ` Marc Sune
2015-05-07 16:04 ` Bruce Richardson
2015-05-07 21:11 ` Wiles, Keith
2015-05-08 9:10 ` Bruce Richardson
2015-05-07 15:50 ` Bruce Richardson
2015-05-11 9:47 ` Thomas Monjalon
2015-05-12 17:04 ` [dpdk-dev] [PATCH 00/19] Move PMDs to drivers directory Bruce Richardson
2015-05-12 17:04 ` [dpdk-dev] [PATCH 01/19] pmds: Use relative rather than absolute paths Bruce Richardson
2015-05-12 17:04 ` [dpdk-dev] [PATCH 02/19] drivers: create new top-level drivers directory Bruce Richardson
2015-05-12 17:04 ` [dpdk-dev] [PATCH 03/19] af_packet: move af_packet pmd to " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 04/19] bond: Move bonded ethdev pmd to drivers Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 05/19] e1000: move e1000 pmd to drivers directory Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 06/19] enic: move enic PMD " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 07/19] fm10k: move fm10k " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 08/19] i40e: move i40e " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 09/19] ixbge: move ixgbe " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 10/19] mlx4: move mlx4 " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 11/19] null pmd: move null " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 12/19] pcap: move pcap pmd " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 13/19] ring pmd: move ring PMD to the " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 14/19] virtio: move virtio PMD to " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 15/19] xmvnet3: move vmxnet3 " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 16/19] xenvirt: move xenvirt " Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 17/19] maintainers: update maintainers with driver paths Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 18/19] doc: update GSG doc for new drivers subdirectory Bruce Richardson
2015-05-12 17:05 ` [dpdk-dev] [PATCH 19/19] doc: update source organisation text for drivers Bruce Richardson
2015-05-12 19:30 ` [dpdk-dev] [PATCH 00/19] Move PMDs to drivers directory Thomas Monjalon
2015-05-13 9:01 ` Bruce Richardson
2015-05-13 13:33 ` Thomas Monjalon
2015-05-13 13:40 ` Bruce Richardson
2015-05-13 15:58 ` Bruce Richardson
2015-05-15 12:54 ` Thomas Monjalon
2015-05-15 13:14 ` Bruce Richardson
2015-05-15 12:36 ` Bruce Richardson
2015-05-15 12:50 ` Thomas Monjalon
2015-05-15 12:56 ` Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 " Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 01/19] pmds: Use relative rather than absolute paths Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 02/19] drivers: create drivers and drivers/net directory Bruce Richardson
2015-05-20 15:04 ` Thomas Monjalon
2015-05-20 15:30 ` Richardson, Bruce
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 03/19] af_packet: move af_packet pmd to " Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 04/19] bond: Move bonded ethdev pmd to drivers/net Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 05/19] e1000: move e1000 pmd to drivers/net directory Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 06/19] enic: move enic PMD " Bruce Richardson
2015-05-20 15:56 ` Thomas Monjalon
2015-05-20 16:04 ` Richardson, Bruce
2015-05-20 16:14 ` Thomas Monjalon
2015-05-20 16:45 ` Sujith Sankar (ssujith)
2015-05-20 16:52 ` Thomas Monjalon
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 07/19] fm10k: move fm10k " Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 08/19] i40e: move i40e " Bruce Richardson
2015-05-18 11:05 ` [dpdk-dev] [PATCH v3 " Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 09/19] ixbge: move ixgbe " Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 10/19] mlx4: move mlx4 " Bruce Richardson
2015-05-23 4:46 ` Or Gerlitz
2015-05-23 20:37 ` Thomas Monjalon
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 11/19] null pmd: move null " Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 12/19] pcap: move pcap pmd to drivers/net Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 13/19] ring pmd: move ring PMD to the drivers directory Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 14/19] virtio: move virtio PMD to drivers/net Bruce Richardson
2015-05-15 15:56 ` [dpdk-dev] [PATCH v2 15/19] xmvnet3: move vmxnet3 " Bruce Richardson
2015-05-15 15:57 ` [dpdk-dev] [PATCH v2 16/19] xenvirt: move xenvirt " Bruce Richardson
2015-05-15 15:57 ` [dpdk-dev] [PATCH v2 17/19] maintainers: update maintainers with driver paths Bruce Richardson
2015-05-15 15:57 ` [dpdk-dev] [PATCH v2 18/19] doc: update GSG doc for new drivers subdirectory Bruce Richardson
2015-05-15 15:57 ` [dpdk-dev] [PATCH v2 19/19] doc: update source organisation text for drivers Bruce Richardson
2015-05-19 11:14 ` [dpdk-dev] [PATCH v2 00/19] Move PMDs to drivers directory Mcnamara, John
2015-05-19 11:24 ` Bruce Richardson
2015-05-19 12:01 ` Thomas Monjalon
2015-05-19 13:40 ` Thomas F Herbert
2015-05-22 14:09 ` Thomas Monjalon
2015-05-22 16:19 ` Bruce Richardson
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=1431012951-6423-2-git-send-email-bruce.richardson@intel.com \
--to=bruce.richardson@intel.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).