X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx4%2FMakefile;h=23b766df1434cdba80d291bea5bef4b36d77b9d0;hb=da44259fbf272bcd0b17a64709280454eb402b62;hp=725717f86fc0712a5607241e2c2eaee130f697d3;hpb=8b3ffe95e75d6d305992505005cbb95969874a15;p=dpdk.git

diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
index 725717f86f..23b766df14 100644
--- a/drivers/net/mlx4/Makefile
+++ b/drivers/net/mlx4/Makefile
@@ -31,6 +31,12 @@
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
+ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS)$(CONFIG_RTE_BUILD_SHARED_LIB),yy)
+all:
+	@echo 'MLX4: Not supported in a combined shared library'
+	@false
+endif
+
 # Library name.
 LIB = librte_pmd_mlx4.a
 
@@ -42,7 +48,6 @@ DEPDIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += lib/librte_ether
 DEPDIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += lib/librte_mbuf
 DEPDIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += lib/librte_eal
 DEPDIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += lib/librte_mempool
-DEPDIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += lib/librte_malloc
 
 # Basic CFLAGS.
 CFLAGS += -O3
@@ -51,6 +56,7 @@ CFLAGS += -g
 CFLAGS += -I.
 CFLAGS += -D_XOPEN_SOURCE=600
 CFLAGS += $(WERROR_FLAGS)
+LDLIBS += -libverbs
 
 # A few warnings cannot be avoided in external headers.
 CFLAGS += -Wno-error=cast-qual