Commit ab061a71 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

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: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 25634298

app/iscsi_top/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

test/lib/iscsi/param/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)

test/lib/iscsi/pdu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)

test/lib/iscsi/target_node/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)

test/lib/util/io_channel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)