X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=agl-basefiles%2Fshare%2Fagl.mk;h=176bac8c834059239d94cf8328b5a6c36ff1695d;hb=2398c899d37acd18ba13304460d3248b3ada3e09;hp=d8de6189af61739b3f3732aeb4c6c99c5ec6da06;hpb=604011e21f44b51f3540711ffe53a16362796ae5;p=staging%2Fbasesystem.git

diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk
index d8de618..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_obsoluted.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/agl/lib
+AGLLDFLAGS += -L=/usr/lib/basesystem
 
 ifneq ($(INST_SHLIBS),libagl_stub)
 AGLLDLIBS += -Wl,-Bdynamic -lpthread
@@ -215,7 +212,7 @@ endif
 COMPONENT_NAME ?= $(error COMPONENT_NAME is not defined)
 AGL_TOPDIR ?= $(DESTDIR)/usr
 AGL_INCDIR := $(AGL_TOPDIR)/include/basesystem
-AGL_LIBDIR := $(AGL_TOPDIR)/lib
+AGL_LIBDIR := $(AGL_TOPDIR)/lib/basesystem
 AGL_BINDIR := $(AGL_TOPDIR)/bin
 AGL_PIXMAPDIR := $(AGL_TOPDIR)/pixmaps
 AGL_UCODEDIR := $(AGL_TOPDIR)/data/ucode
@@ -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/agl/lib
+# 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)
 
@@ -444,8 +439,9 @@ ifneq ($(strip $(INST_HEADERS)),)
 endif
 
 
-HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/agl/share/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; \