From 604011e21f44b51f3540711ffe53a16362796ae5 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Sun, 22 Nov 2020 02:10:01 +0900 Subject: [PATCH] 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 Change-Id: I170f23db7178b79bb1081fde9198cb244a51e64c --- agl-basefiles/share/agl.mk | 12 ++++++------ hal/boot_hal/Makefile | 4 ++-- hal/clock_hal/Makefile | 4 ++-- hal/deck_hal/Makefile | 4 ++-- hal/input_hal/Makefile | 10 +++++----- hal/nv_hal/Makefile | 4 ++-- hal/positioning_hal/Makefile | 4 ++-- hal/power_hal/Makefile | 5 ++--- hal/security_hal/Makefile | 4 ++-- hal/soc_temperature_hal/Makefile | 4 ++-- hal/update_hal/Makefile | 4 ++-- hal/usb_hal/Makefile | 4 ++-- hal/vehicle_hal/Makefile | 4 ++-- hal/video_in_hal/Makefile | 2 +- service/other/rpc_library/tool/Makefile | 4 ++-- .../config/library/system_manager_config/last2order/Makefile | 2 +- .../config/library/system_manager_config/order/Makefile | 2 +- .../system/config/library/system_manager_config/xml/Makefile | 2 +- service/system/system_manager/server/Makefile | 2 +- service/system/task_manager/client/libtskmcfg/Makefile | 2 +- service/vehicle/positioning/server/src/Sensor/Makefile | 2 +- 21 files changed, 42 insertions(+), 43 deletions(-) diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk index 77d4512..d8de618 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 @@ -445,7 +445,7 @@ endif HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/agl/share/launch_xml2cfg.sh -CONF_H = $(SYSROOT)/usr/agl/include/sm_launch_conf.h +CONF_H = $(SYSROOT)/usr/include/basesystem/sm_launch_conf.h %.cfg: %.xml set -e; \ diff --git a/hal/boot_hal/Makefile b/hal/boot_hal/Makefile index d184316..a5b09fb 100755 --- a/hal/boot_hal/Makefile +++ b/hal/boot_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/boot_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC diff --git a/hal/clock_hal/Makefile b/hal/clock_hal/Makefile index e417a15..cec7813 100755 --- a/hal/clock_hal/Makefile +++ b/hal/clock_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/clock_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC diff --git a/hal/deck_hal/Makefile b/hal/deck_hal/Makefile index fbe4ddf..340571a 100755 --- a/hal/deck_hal/Makefile +++ b/hal/deck_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/deck_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC diff --git a/hal/input_hal/Makefile b/hal/input_hal/Makefile index 35dfefd..bfa5c2c 100755 --- a/hal/input_hal/Makefile +++ b/hal/input_hal/Makefile @@ -24,9 +24,9 @@ HEADER := ./hal_api/input_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/libdrm -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -76,6 +76,6 @@ install: @echo $@ done. install-input: - install -m 0755 -d $(DESTDIR)/usr/agl/include/$(COMPONENT_NAME)/ - install -m 0644 ./hal_api/$(COMPONENT_NAME)/aglinput.h $(DESTDIR)/usr/agl/include/$(COMPONENT_NAME)/ - install -m 0644 ./hal_api/$(COMPONENT_NAME)/extinput.h $(DESTDIR)/usr/agl/include/$(COMPONENT_NAME)/ + install -m 0755 -d $(DESTDIR)/usr/include/basesystem/$(COMPONENT_NAME)/ + install -m 0644 ./hal_api/$(COMPONENT_NAME)/aglinput.h $(DESTDIR)/usr/include/basesystem/$(COMPONENT_NAME)/ + install -m 0644 ./hal_api/$(COMPONENT_NAME)/extinput.h $(DESTDIR)/usr/include/basesystem/$(COMPONENT_NAME)/ diff --git a/hal/nv_hal/Makefile b/hal/nv_hal/Makefile index 2f2d89f..a6c2ee8 100755 --- a/hal/nv_hal/Makefile +++ b/hal/nv_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/nv_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC diff --git a/hal/positioning_hal/Makefile b/hal/positioning_hal/Makefile index 0b5a74d..d0d0a69 100755 --- a/hal/positioning_hal/Makefile +++ b/hal/positioning_hal/Makefile @@ -25,8 +25,8 @@ CXXFLAGS += -I./inc/Common CXXFLAGS += -I./inc/GpsCommon CXXFLAGS += -I./inc/LineSensDrv CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include/ -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### diff --git a/hal/power_hal/Makefile b/hal/power_hal/Makefile index b0a0c28..ba5f3ab 100755 --- a/hal/power_hal/Makefile +++ b/hal/power_hal/Makefile @@ -21,9 +21,8 @@ HEADER := hal_api/power_hal.h ######### include paths/files ################### CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -#CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include/stub -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC diff --git a/hal/security_hal/Makefile b/hal/security_hal/Makefile index 5435be7..7658c0f 100755 --- a/hal/security_hal/Makefile +++ b/hal/security_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/security_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC diff --git a/hal/soc_temperature_hal/Makefile b/hal/soc_temperature_hal/Makefile index fa30b35..62ce12d 100755 --- a/hal/soc_temperature_hal/Makefile +++ b/hal/soc_temperature_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/soc_temperature_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC diff --git a/hal/update_hal/Makefile b/hal/update_hal/Makefile index 8accb94..045462c 100755 --- a/hal/update_hal/Makefile +++ b/hal/update_hal/Makefile @@ -29,6 +29,6 @@ clean: ######### make installs ######################### install: - install -d -m 0755 $(DESTDIR)/usr/include - install -m 0644 $(HEADER) $(DESTDIR)/usr/include + install -d -m 0755 $(DESTDIR)/usr/include/basesystem + install -m 0644 $(HEADER) $(DESTDIR)/usr/include/basesystem @echo $@ done. diff --git a/hal/usb_hal/Makefile b/hal/usb_hal/Makefile index 1a107ce..be2b796 100755 --- a/hal/usb_hal/Makefile +++ b/hal/usb_hal/Makefile @@ -22,8 +22,8 @@ HEADER := ./hal_api/usb_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC diff --git a/hal/vehicle_hal/Makefile b/hal/vehicle_hal/Makefile index d009b13..2bed2e2 100755 --- a/hal/vehicle_hal/Makefile +++ b/hal/vehicle_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/vehicle_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC diff --git a/hal/video_in_hal/Makefile b/hal/video_in_hal/Makefile index 25ebaab..619f45d 100755 --- a/hal/video_in_hal/Makefile +++ b/hal/video_in_hal/Makefile @@ -21,7 +21,7 @@ HEADER = hal_api/video_in_hal.h ######### include paths/files ################### CFLAGS += -I./hal_api/ -CFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsoluted.h ######### compile options ####################### CFLAGS += -Wall -fPIC 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 -- 2.16.6