From ab061a717ab168182ae56c48a153eaf99d0b71c7 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 21 Mar 2017 13:50:27 -0700 Subject: [PATCH] build: replace DPDK_INC with ENV_CFLAGS A few instances of DPDK_INC were added after the env library abstraction was introduced; replace them with the correct ENV_CFLAGS variable defined by env.mk. Change-Id: I54ab2b2360a72506049fee549491f6614601a148 Signed-off-by: Daniel Verkamp --- app/iscsi_top/Makefile | 2 +- test/lib/iscsi/param/Makefile | 2 +- test/lib/iscsi/pdu/Makefile | 2 +- test/lib/iscsi/target_node/Makefile | 2 +- test/lib/util/io_channel/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/iscsi_top/Makefile b/app/iscsi_top/Makefile index 50bdbb429..3475336bb 100644 --- a/app/iscsi_top/Makefile +++ b/app/iscsi_top/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -CXXFLAGS += $(DPDK_INC) +CXXFLAGS += $(ENV_CXXFLAGS) CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib CXX_SRCS = iscsi_top.cpp diff --git a/test/lib/iscsi/param/Makefile b/test/lib/iscsi/param/Makefile index c4a11462f..434a05711 100644 --- a/test/lib/iscsi/param/Makefile +++ b/test/lib/iscsi/param/Makefile @@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = log util cunit -CFLAGS += $(DPDK_INC) +CFLAGS += $(ENV_CFLAGS) CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/lib LIBS += $(SPDK_LIB_LINKER_ARGS) diff --git a/test/lib/iscsi/pdu/Makefile b/test/lib/iscsi/pdu/Makefile index a65c7507e..2f9d5d330 100644 --- a/test/lib/iscsi/pdu/Makefile +++ b/test/lib/iscsi/pdu/Makefile @@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = log util cunit trace conf -CFLAGS += $(DPDK_INC) +CFLAGS += $(ENV_CFLAGS) CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/lib LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) diff --git a/test/lib/iscsi/target_node/Makefile b/test/lib/iscsi/target_node/Makefile index b72d22c8e..aa3f30d6a 100644 --- a/test/lib/iscsi/target_node/Makefile +++ b/test/lib/iscsi/target_node/Makefile @@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = log conf util cunit -CFLAGS += $(DPDK_INC) +CFLAGS += $(ENV_CFLAGS) CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/lib LIBS += $(SPDK_LIB_LINKER_ARGS) diff --git a/test/lib/util/io_channel/Makefile b/test/lib/util/io_channel/Makefile index 08248946e..1e1a54b32 100644 --- a/test/lib/util/io_channel/Makefile +++ b/test/lib/util/io_channel/Makefile @@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = log cunit -CFLAGS += $(DPDK_INC) +CFLAGS += $(ENV_CFLAGS) CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/lib LIBS += $(SPDK_LIB_LINKER_ARGS)