From 2398c899d37acd18ba13304460d3248b3ada3e09 Mon Sep 17 00:00:00 2001
From: Riku Nomoto <riku_nomoto@mail.toyota.co.jp>
Date: Sat, 19 Dec 2020 20:35:59 +0900
Subject: Changed to not use SDKTARGETSYSROOT.

Yocto sets the recipe-sysroot directory as the sysroot.
Therefore, there is no need to define the path of the
recipe-sysroot using SDKTARGETSYSROOT in the recipe.

Signed-off-by: Riku Nomoto <riku_nomoto@mail.toyota.co.jp>
Change-Id: I9f3c7155a0f9656a916a2d6ba71371a4376b502b
---
 agl-basefiles/share/agl.mk | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'agl-basefiles/share')

diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk
index dfcf908..176bac8 100644
--- a/agl-basefiles/share/agl.mk
+++ b/agl-basefiles/share/agl.mk
@@ -80,13 +80,10 @@ endif
 
 
 #################################################################################
-SYSROOT ?= $(SDKTARGETSYSROOT)
-DESTDIR ?= $(SDKTARGETSYSROOT)
-
 WARN_FLAGS ?= -Wall
 DEBUG_FLAGS ?= -g
 
-AUTO_INCLUDE := -include $(SYSROOT)/usr/include/basesystem/agl_types_deprecated.h
+AUTO_INCLUDE := -include agl_types_deprecated.h
 AGLCFLAGS := $(CFLAGS) $(COMPONENT_CFLAGS)
 AGLCXXFLAGS := $(CXXFLAGS) $(COMPONENT_CXXFLAGS)
 AGLCPPFLAGS := $(CPPFLAGS) $(COMPONENT_CPPFLAGS)
@@ -200,10 +197,10 @@ AGLCPPFLAGS += -D_GNU_SOURCE
 AGLCPPFLAGS += -DAGL_PosixBasedOS001LEGACY_USED -DAGL_STUB -DLINUX
 
 ## for agl header##
-AGLCPPFLAGS += -I$(SYSROOT)/usr/include/basesystem
+AGLCPPFLAGS += -I=/usr/include/basesystem
 
 ## for agl library##
-AGLLDFLAGS += -L$(SYSROOT)/usr/lib/basesystem
+AGLLDFLAGS += -L=/usr/lib/basesystem
 
 ifneq ($(INST_SHLIBS),libagl_stub)
 AGLLDLIBS += -Wl,-Bdynamic -lpthread
@@ -328,10 +325,9 @@ ifneq ($(AEXT),)
 CLEAN_FILES += $(foreach lib,$(INST_SHLIBS) $(INST_PROGS),$(if $(lib),$(lib).map$(AEXT)))
 endif
 
-
 #################################################################################
 
-RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/lib/basesystem
+# RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/lib/basesystem
 
 #################################################################################
 SUBDIRS := $(filter-out mock,$(SUBDIRS))
@@ -401,7 +397,6 @@ generate-header-list: install-header-local
 	echo $(COMPONENT_NAME) > $(addsuffix .list, $(abspath ./))
 	ls -1 $(TOPDIR)/tmp_head/usr/include/basesystem/$(COMPONENT_NAME)/ >> $(addsuffix .list, $(abspath ./))
 	rm -rf ./tmp_head
-	
 
 build-prog: $(INST_PROGS:%=%.out)
 
@@ -445,8 +440,8 @@ endif
 
 
 
-HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/share/basesystem/launch_xml2cfg.sh
-CONF_H = $(SYSROOT)/usr/include/basesystem/sm_launch_conf.h
+HOST_LAUNCH_XML2CFG = /usr/share/basesystem/launch_xml2cfg.sh
+CONF_H = /usr/include/basesystem/sm_launch_conf.h
 
 %.cfg: %.xml
 	set -e; \
-- 
cgit 1.2.3-korg