Organized dependencies of xpath

[staging/basesystem.git] / agl-basefiles / share / agl.mk

diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk
index 77d4512..3723ead 100644 (file)
--- a/agl-basefiles/share/agl.mk
+++ b/agl-basefiles/share/agl.mk
@@ -80,13 +80,10 @@ endif
 
 
 #################################################################################
-SYSROOT ?= $(SDKTARGETSYSROOT)
-DESTDIR ?= $(SDKTARGETSYSROOT)
-
 WARN_FLAGS ?= -Wall
 DEBUG_FLAGS ?= -g
 
-AUTO_INCLUDE := -include $(SYSROOT)/usr/agl/include/agl_types_obsoluted.h
+AUTO_INCLUDE := -include agl_types_deprecated.h
 AGLCFLAGS := $(CFLAGS) $(COMPONENT_CFLAGS)
 AGLCXXFLAGS := $(CXXFLAGS) $(COMPONENT_CXXFLAGS)
 AGLCPPFLAGS := $(CPPFLAGS) $(COMPONENT_CPPFLAGS)
@@ -200,10 +197,10 @@ AGLCPPFLAGS += -D_GNU_SOURCE
 AGLCPPFLAGS += -DAGL_PosixBasedOS001LEGACY_USED -DAGL_STUB -DLINUX
 
 ## for agl header##
-AGLCPPFLAGS += -I$(SYSROOT)/usr/agl/include
+AGLCPPFLAGS += -I=/usr/include/basesystem
 
 ## for agl library##
-AGLLDFLAGS += -L$(SYSROOT)/usr/agl/lib
+AGLLDFLAGS += -L=/usr/lib/basesystem
 
 ifneq ($(INST_SHLIBS),libagl_stub)
 AGLLDLIBS += -Wl,-Bdynamic -lpthread
@@ -213,9 +210,9 @@ endif
 ##########################################
 
 COMPONENT_NAME ?= $(error COMPONENT_NAME is not defined)
-AGL_TOPDIR ?= $(DESTDIR)/usr/agl
-AGL_INCDIR := $(AGL_TOPDIR)/include
-AGL_LIBDIR := $(AGL_TOPDIR)/lib
+AGL_TOPDIR ?= $(DESTDIR)/usr
+AGL_INCDIR := $(AGL_TOPDIR)/include/basesystem
+AGL_LIBDIR := $(AGL_TOPDIR)/lib/basesystem
 AGL_BINDIR := $(AGL_TOPDIR)/bin
 AGL_PIXMAPDIR := $(AGL_TOPDIR)/pixmaps
 AGL_UCODEDIR := $(AGL_TOPDIR)/data/ucode
@@ -269,7 +266,6 @@ CLEAN_SOBJS := $(foreach lib,$(INST_SHLIBS) $(INST_TEST_MOCK_SHLIBS),$(call DEL_
 CLEAN_GCDA := $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(NOINST_LIBS) $(INST_PROGS) $(INST_ITV2_TESTPROGS) $(INST_TESTPROGS),$(call DEL_GCDA,$(lib)))
 CLEAN_GCNO := $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(NOINST_LIBS) $(INST_PROGS) $(INST_ITV2_TESTPROGS) $(INST_TESTPROGS),$(call DEL_GCNO,$(lib)))
 CLEAN_GCOV := $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(NOINST_LIBS) $(INST_PROGS) $(INST_ITV2_TESTPROGS) $(INST_TESTPROGS),$(call DEL_GCOV,$(lib)))
-CLEAN_CFG  := $(INST_UT_SMCONF:%=%.cfg) $(INST_IT_SMCONF:%=%.cfg)
 
 CLEAN_INFO := $(sort $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(INST_TEST_MOCK_LIBS) $(INST_TEST_MOCK_SHLIBS) $(NOINST_LIBS) $(INST_PROGS) $(INST_ITV2_TESTPROGS) $(INST_TESTPROGS),$(call DEL_INFO,$(lib))))
 
@@ -323,15 +319,13 @@ CLEAN_FILES += $(IPC_API_RULES) $(CLEAN_IPC_API_SRCS) $(IPC_API_DEPS)
 CLEAN_FILES += $(INST_DATAINITOBJ)
 CLEAN_FILES += $(CLEAN_INFO)
 CLEAN_FILES += $(CLEAN_GCNO) $(CLEAN_GCDA) $(CLEAN_GCOV)
-CLEAN_FILES += $(CLEAN_CFG)
 ifneq ($(AEXT),)
 CLEAN_FILES += $(foreach lib,$(INST_SHLIBS) $(INST_PROGS),$(if $(lib),$(lib).map$(AEXT)))
 endif
 
-
 #################################################################################
 
-RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/agl/lib
+# RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/lib/basesystem
 
 #################################################################################
 SUBDIRS := $(filter-out mock,$(SUBDIRS))
@@ -342,7 +336,6 @@ SUBDIRS := $(filter-out mock,$(SUBDIRS))
 .PHONY: build-prog $(SUBDIRS:%=build-prog-%)
 .PHONY: build-shlib $(SUBDIRS:%=build-shlib-%)
 .PHONY: build-arlib $(SUBDIRS:%=build-arlib-%)
-.PHONY: build-cfg
 .PHONY: install-header $(SUBDIRS:%=install-header-%)
 .PHONY: install-lib
 .PHONY: install-shlib $(SUBDIRS:%=install-shlib-%)
@@ -369,9 +362,7 @@ lint:
        @set -e;\
        $(MAKE) lint-exec
 
-
-#all: build-lib build-prog build-test-mock-lib build-cfg all-subdirs
-all: build-lib build-prog build-cfg all-subdirs
+all: build-lib build-prog all-subdirs
 
 all-subdirs:
        @set -e;\
@@ -399,9 +390,8 @@ 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
-       
 
 build-prog: $(INST_PROGS:%=%.out)
 
@@ -443,18 +433,6 @@ ifneq ($(strip $(INST_HEADERS)),)
        install -m 0644 $< $(HEADER_INSTALL_DIR)
 endif
 
-
-HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/agl/share/launch_xml2cfg.sh
-CONF_H = $(SYSROOT)/usr/agl/include/sm_launch_conf.h
-
-%.cfg: %.xml
-       set -e; \
-       cpp -P -include $(CONF_H) $< > $<.tmp ; \
-       cd $(dir $<.tmp); \
-       $(HOST_LAUNCH_XML2CFG) $(notdir $<.tmp) > $@ ; \
-       rm -f $<.tmp ;
-
-
 install-data: $(INST_PIXMAPS:%=$(PIXMAP_INSTALL_DIR)/%) $(INST_UCODE:%=$(UCODE_INSTALL_DIR)/%) $(INST_DATAINITOBJ:%=$(DATAINITOBJ_INSTALL_DIR)/%) $(OBJ_COPY_LIST:%=$(OBJ_COPY_INSTALL_DIR)/%) $(INST_CONFBIN:%=$(CONFBIN_INSTALL_DIR)/%)