git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i40e/base: support building both PF and VF driver together
[dpdk.git]
/
mk
/
rte.vars.mk
diff --git
a/mk/rte.vars.mk
b/mk/rte.vars.mk
index
1e874ee
..
d2f01b6
100644
(file)
--- a/
mk/rte.vars.mk
+++ b/
mk/rte.vars.mk
@@
-71,10
+71,11
@@
ifneq ($(BUILDING_RTE_SDK),)
ifeq ($(RTE_BUILD_COMBINE_LIBS),)
RTE_BUILD_COMBINE_LIBS := n
endif
ifeq ($(RTE_BUILD_COMBINE_LIBS),)
RTE_BUILD_COMBINE_LIBS := n
endif
- RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%)
- ifeq ($(RTE_LIBNAME),)
- RTE_LIBNAME := intel_dpdk
- endif
+endif
+
+RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%)
+ifeq ($(RTE_LIBNAME),)
+RTE_LIBNAME := intel_dpdk
endif
# RTE_TARGET is deducted from config when we are building the SDK.
endif
# RTE_TARGET is deducted from config when we are building the SDK.
@@
-85,9
+86,9
@@
$(error RTE_TARGET is not defined)
endif
ifeq ($(BUILDING_RTE_SDK),)
endif
ifeq ($(BUILDING_RTE_SDK),)
-# if we are building an external app/lib, include rte.extvars.mk that will
+# if we are building an external app/lib, include
internal/
rte.extvars.mk that will
# define RTE_OUTPUT, RTE_SRCDIR, RTE_EXTMK, RTE_SDK_BIN, (etc ...)
# define RTE_OUTPUT, RTE_SRCDIR, RTE_EXTMK, RTE_SDK_BIN, (etc ...)
-include $(RTE_SDK)/mk/rte.extvars.mk
+include $(RTE_SDK)/mk/
internal/
rte.extvars.mk
endif
CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_IGB_PMD)
endif
CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_IGB_PMD)