X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=agl-basefiles%2Fshare%2Fagl.mk;h=fa1e8d5fe42d883ec5fa58b3f781fb139d534b69;hb=9ce78547cb47c9db0d75cc7b36f8e679e831820b;hp=77d4512e99a28c10bf8b34f1096d1c63813b16c3;hpb=8e0e00d21146a84c18f9cf9409e187b4fb0248aa;p=staging%2Fbasesystem.git

diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk
index 77d4512..fa1e8d5 100644
--- a/agl-basefiles/share/agl.mk
+++ b/agl-basefiles/share/agl.mk
@@ -86,7 +86,7 @@ DESTDIR ?= $(SDKTARGETSYSROOT)
 WARN_FLAGS ?= -Wall
 DEBUG_FLAGS ?= -g
 
-AUTO_INCLUDE := -include $(SYSROOT)/usr/agl/include/agl_types_obsoluted.h
+AUTO_INCLUDE := -include $(SYSROOT)/usr/include/basesystem/agl_types_obsoluted.h
 AGLCFLAGS := $(CFLAGS) $(COMPONENT_CFLAGS)
 AGLCXXFLAGS := $(CXXFLAGS) $(COMPONENT_CXXFLAGS)
 AGLCPPFLAGS := $(CPPFLAGS) $(COMPONENT_CPPFLAGS)
@@ -200,7 +200,7 @@ AGLCPPFLAGS += -D_GNU_SOURCE
 AGLCPPFLAGS += -DAGL_PosixBasedOS001LEGACY_USED -DAGL_STUB -DLINUX
 
 ## for agl header##
-AGLCPPFLAGS += -I$(SYSROOT)/usr/agl/include
+AGLCPPFLAGS += -I$(SYSROOT)/usr/include/basesystem
 
 ## for agl library##
 AGLLDFLAGS += -L$(SYSROOT)/usr/agl/lib
@@ -213,8 +213,8 @@ endif
 ##########################################
 
 COMPONENT_NAME ?= $(error COMPONENT_NAME is not defined)
-AGL_TOPDIR ?= $(DESTDIR)/usr/agl
-AGL_INCDIR := $(AGL_TOPDIR)/include
+AGL_TOPDIR ?= $(DESTDIR)/usr
+AGL_INCDIR := $(AGL_TOPDIR)/include/basesystem
 AGL_LIBDIR := $(AGL_TOPDIR)/lib
 AGL_BINDIR := $(AGL_TOPDIR)/bin
 AGL_PIXMAPDIR := $(AGL_TOPDIR)/pixmaps
@@ -399,7 +399,7 @@ build-arlib: $(INST_LIBS:%=%.a) $(NOINST_LIBS:%=%.a)
 TOPDIR=$(abspath ./)
 generate-header-list: install-header-local
 	echo $(COMPONENT_NAME) > $(addsuffix .list, $(abspath ./))
-	ls -1 $(TOPDIR)/tmp_head/usr/agl/include/$(COMPONENT_NAME)/ >> $(addsuffix .list, $(abspath ./))
+	ls -1 $(TOPDIR)/tmp_head/usr/include/basesystem/$(COMPONENT_NAME)/ >> $(addsuffix .list, $(abspath ./))
 	rm -rf ./tmp_head
 	
 
@@ -444,8 +444,9 @@ ifneq ($(strip $(INST_HEADERS)),)
 endif
 
 
-HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/agl/share/launch_xml2cfg.sh
-CONF_H = $(SYSROOT)/usr/agl/include/sm_launch_conf.h
+
+HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/share/basesystem/launch_xml2cfg.sh
+CONF_H = $(SYSROOT)/usr/include/basesystem/sm_launch_conf.h
 
 %.cfg: %.xml
 	set -e; \