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
cfgfile: fix leak on creation error
[dpdk.git]
/
drivers
/
net
/
cxgbe
/
Makefile
diff --git
a/drivers/net/cxgbe/Makefile
b/drivers/net/cxgbe/Makefile
index
e2ff412
..
65df142
100644
(file)
--- a/
drivers/net/cxgbe/Makefile
+++ b/
drivers/net/cxgbe/Makefile
@@
-45,7
+45,7
@@
EXPORT_MAP := rte_pmd_cxgbe_version.map
LIBABIVER := 1
LIBABIVER := 1
-ifeq ($(C
C), icc
)
+ifeq ($(C
ONFIG_RTE_TOOLCHAIN_ICC),y
)
#
# CFLAGS for icc
#
#
# CFLAGS for icc
#
@@
-54,18
+54,23
@@
else
#
# CFLAGS for gcc/clang
#
#
# CFLAGS for gcc/clang
#
-ifeq ($(shell test $(CC) = gcc && test $(GCC_VERSION) -ge 44 && echo 1), 1)
+ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
+ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
CFLAGS += -Wno-deprecated
endif
CFLAGS += -Wno-deprecated
endif
+endif
CFLAGS_BASE_DRIVER =
endif
CFLAGS_BASE_DRIVER =
endif
+LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
+LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
+LDLIBS += -lrte_bus_pci
#
# Add extra flags for base driver files (also known as shared code)
# to disable warnings in them
#
#
# 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 $(SRCDIR)/base/*.c
)))
+BASE_DRIVER_OBJS=$(
sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)
)))
$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
VPATH += $(SRCDIR)/base
$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
VPATH += $(SRCDIR)/base
@@
-79,9
+84,4
@@
SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_main.c
SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += sge.c
SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4_hw.c
SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += sge.c
SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4_hw.c
-# this lib depends upon:
-DEPDIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += lib/librte_eal lib/librte_ether
-DEPDIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += lib/librte_mempool lib/librte_mbuf
-DEPDIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += lib/librte_net
-
include $(RTE_SDK)/mk/rte.lib.mk
include $(RTE_SDK)/mk/rte.lib.mk