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 at 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
