Fix the path to the directory of the include files

Fix the path to the directory of the include files,
'/usr/agl/include' to follow the standard, '/usr/include/'
and add subsystem name 'basesystem' for agl-basesystem.

Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: I170f23db7178b79bb1081fde9198cb244a51e64c

7 files changed, 8 insertions, 8 deletions

diff --git a/service/other/rpc_library/tool/Makefile b/service/other/rpc_library/tool/Makefile
index 8ffd816..64bc6e4 100755
--- a/service/other/rpc_library/tool/Makefile
+++ b/service/other/rpc_library/tool/Makefile
@@ -24,8 +24,8 @@ YFLAGS := -d -t
 LEX := flex
 LFLAGS := -d
 
-CPPFLAGS := -I../library/include -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h
-CFLAGS := -Wall -Wno-unused-function -Wno-unused-variable -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h
+CPPFLAGS := -I../library/include -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h
+CFLAGS := -Wall -Wno-unused-function -Wno-unused-variable -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h
 
 rpc_apidef:	apidef.tab.o lex.yy.o apidef.o
 	$(CXX) $(CPPFLAGS) -o $@ $^
diff --git a/service/system/config/library/system_manager_config/last2order/Makefile b/service/system/config/library/system_manager_config/last2order/Makefile
index f38ee77..8384d72 100755
--- a/service/system/config/library/system_manager_config/last2order/Makefile
+++ b/service/system/config/library/system_manager_config/last2order/Makefile
@@ -19,7 +19,7 @@
 CONFXML_DIR_PATH ?= $(SDKTARGETSYSROOT)/usr/agl/conf/sm_last2order
 
 #path to order file
-ORDER_DEF_PATH ?= $(SDKTARGETSYSROOT)/usr/agl/include/agl_wakeup_order.h
+ORDER_DEF_PATH ?= $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_wakeup_order.h
 
 #path to be installed CFO file
 CONF_INSTALL_DIR ?= $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager
diff --git a/service/system/config/library/system_manager_config/order/Makefile b/service/system/config/library/system_manager_config/order/Makefile
index 38af0ee..e0d68fe 100755
--- a/service/system/config/library/system_manager_config/order/Makefile
+++ b/service/system/config/library/system_manager_config/order/Makefile
@@ -19,7 +19,7 @@ HOST_CPP = cpp
 HOST_ORDER_XML2CFG = ./launch_order_xml2cfg.pl
 
 CONF_DIR = $(SDKTARGETSYSROOT)/usr/agl/conf
-CONF_WON_H = $(SDKTARGETSYSROOT)/usr/agl/include/agl_wakeup_order.h
+CONF_WON_H = $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_wakeup_order.h
 
 LAUNCH_XMLFILES = $(shell cd $(CONF_DIR)/sm_launch; ls *.xml)
 ORDER_XMLFILES = $(LAUNCH_XMLFILES:%.xml=%.order)
diff --git a/service/system/config/library/system_manager_config/xml/Makefile b/service/system/config/library/system_manager_config/xml/Makefile
index e11288c..b73fdc2 100755
--- a/service/system/config/library/system_manager_config/xml/Makefile
+++ b/service/system/config/library/system_manager_config/xml/Makefile
@@ -19,7 +19,7 @@ HOST_CPP = cpp
 HOST_LAUNCH_XML2CFG = ./launch_xml2cfg.sh
 
 CONF_DIR = $(SDKTARGETSYSROOT)/usr/agl/conf
-CONF_THREAD_H = $(SDKTARGETSYSROOT)/usr/agl/include/agl_thread.h
+CONF_THREAD_H = $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_thread.h
 
 LAUNCH_XMLFILES = $(shell cd $(CONF_DIR)/sm_launch; ls *.xml)
 LAUNCH_CFGFILES = $(LAUNCH_XMLFILES:%.xml=%.cfg)
diff --git a/service/system/system_manager/server/Makefile b/service/system/system_manager/server/Makefile
index 04185f9..b518c2e 100755
--- a/service/system/system_manager/server/Makefile
+++ b/service/system/system_manager/server/Makefile
@@ -106,7 +106,7 @@ LINK_CXX=Y
 install-data: install_data
 
 install_data:
-	cpp -P -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_thread.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml
+	cpp -P -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_thread.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml
 	$(SDKTARGETSYSROOT)/usr/agl/share/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg
 	install -d -m 755 $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata
 	install -m 644 ./sm_launch.cfg $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata
diff --git a/service/system/task_manager/client/libtskmcfg/Makefile b/service/system/task_manager/client/libtskmcfg/Makefile
index 9fe2ed3..a7e4a9e 100755
--- a/service/system/task_manager/client/libtskmcfg/Makefile
+++ b/service/system/task_manager/client/libtskmcfg/Makefile
@@ -79,7 +79,7 @@ agl_thread.h:$(WAKESHUTCONF_DIR)/agl_thread.h
 
 tskm_launch.xml:$(WAKESHUTCONF_DIR)/tskm_launch.xml agl_thread.h
 	$(HOST_CPP) -P -include agl_thread.h $< > $@
-#tskm_launch.xml:$(SVCONF_DIR)/tskm_launch.xml $(SDKTARGETSYSROOT)/usr/agl/include/agl_thread.h
+#tskm_launch.xml:$(SVCONF_DIR)/tskm_launch.xml $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_thread.h
 #	$(HOST_CPP) -P -include agl_thread.h $< > $@
 
 $(XMLOUTFILE):top.xml $(PARSEXMLCMD) $(CONFIG_FILES) 
diff --git a/service/vehicle/positioning/server/src/Sensor/Makefile b/service/vehicle/positioning/server/src/Sensor/Makefile
index bb70229..59e8c1f 100755
--- a/service/vehicle/positioning/server/src/Sensor/Makefile
+++ b/service/vehicle/positioning/server/src/Sensor/Makefile
@@ -155,7 +155,7 @@ CPPFLAGS += -I../ServiceInterface/VehicleIf
 CPPFLAGS += -I../nsfw/include
 #CPPFLAGS += -I../../../../diag_code/library/include
 
-CPPFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include/vehicle_service
+CPPFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem/vehicle_service
 
 ######### add compile option #############
 CPPFLAGS += -DLINUX