diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2020-11-22 02:10:01 +0900 |
|---|---|---|
| committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2020-11-23 13:27:31 +0000 |
| commit | 604011e21f44b51f3540711ffe53a16362796ae5 (patch) | |
| tree | e15d5c5c7884a10721350cbe932257b00cdcb317 /agl-basefiles | |
| parent | 17cf21bcf8a2e29d2cbcf0a313474d2a4ee44f5d (diff) | |
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
Diffstat (limited to 'agl-basefiles')
| -rw-r--r-- | agl-basefiles/share/agl.mk | 12 |
1 files changed, 6 insertions, 6 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; \ |