makefiles: don't assume that output and target is always the same

Change-Id: I7d313c74e2daf4d75c5c11460bdb87737cd46851
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

diff --git a/examples/udpfwd/Makefile b/examples/udpfwd/Makefile
index 8945e88..fae1c34 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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