summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ananyev <konstantin.ananyev@intel.com>2016-10-07 14:11:27 +0100
committerKonstantin Ananyev <konstantin.ananyev@intel.com>2016-10-07 14:30:01 +0100
commit44222fc2300cd43bb52e5c1ac7050e27fc4c6b6e (patch)
tree0c6b10903d52c7d614dfeb31bd33aac324eecdeb
parent2fea8d3d522d31cb279a90b3e49a6f217878b35b (diff)
makefiles: don't assume that output and target is always the same
Change-Id: I7d313c74e2daf4d75c5c11460bdb87737cd46851 Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
-rw-r--r--examples/udpfwd/Makefile4
-rw-r--r--test/dring/Makefile4
-rw-r--r--test/gtest/Makefile4
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/udpfwd/Makefile b/examples/udpfwd/Makefile
index 8945e88..fae1c34 100644
--- a/examples/udpfwd/Makefile
+++ b/examples/udpfwd/Makefile
@@ -34,9 +34,9 @@ SRCS-y += pkt.c
SRCS-y += main.c
CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(TLDK_ROOT)/$(RTE_TARGET)/include
+CFLAGS += -I$(RTE_OUTPUT)/include
-LDLIBS += -L$(TLDK_ROOT)/$(RTE_TARGET)/lib
+LDLIBS += -L$(RTE_OUTPUT)/lib
LDLIBS += -ltle_udp
EXTRA_CFLAGS += -O3
diff --git a/test/dring/Makefile b/test/dring/Makefile
index b4e7a70..6549744 100644
--- a/test/dring/Makefile
+++ b/test/dring/Makefile
@@ -32,9 +32,9 @@ APP = test_dring
SRCS-y += test_dring.c
CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(TLDK_ROOT)/$(RTE_TARGET)/include
+CFLAGS += -I$(RTE_OUTPUT)/include
-LDLIBS += -L$(TLDK_ROOT)/$(RTE_TARGET)/lib
+LDLIBS += -L$(RTE_OUTPUT)/lib
LDLIBS += -ltle_dring
EXTRA_CFLAGS += -O3
diff --git a/test/gtest/Makefile b/test/gtest/Makefile
index 5f47cc4..3e76eab 100644
--- a/test/gtest/Makefile
+++ b/test/gtest/Makefile
@@ -78,7 +78,7 @@ SRCS-y += test_tle_udp_stream.cpp
CXXFLAGS += -std=c++11
CXXFLAGS += -I$(GTEST_DIR)/include
CXXFLAGS += -I$(GMOCK_DIR)/include
-CXXFLAGS += -I$(TLDK_ROOT)/$(RTE_TARGET)/include
+CXXFLAGS += -I$(RTE_OUTPUT)/include
LDFLAGS += -lstdc++
LDFLAGS += -L$(GMOCK_DIR) -lgmock
@@ -105,7 +105,7 @@ LDLIBS += gtest-rfc.o
LDFLAGS += -lstdc++
LDFLAGS += -L$(GMOCK_DIR) -lgmock
-LDLIBS += -L$(TLDK_ROOT)/$(RTE_TARGET)/lib
+LDLIBS += -L$(RTE_OUTPUT)/lib
LDLIBS += -ltle_udp -ltle_dring
include $(TLDK_ROOT)/mk/tle.app.mk