From 604011e21f44b51f3540711ffe53a16362796ae5 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Sun, 22 Nov 2020 02:10:01 +0900 Subject: 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 --- 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 +- 13 files changed, 28 insertions(+), 29 deletions(-) (limited to 'hal') 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 -- cgit 1.2.3-korg