X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=agl-basefiles%2Fshare%2Fagl.mk;h=9369fd3343b252a98cf1182ad3232d9652c9a155;hb=refs%2Fchanges%2F24%2F25924%2F3;hp=77d4512e99a28c10bf8b34f1096d1c63813b16c3;hpb=8e0e00d21146a84c18f9cf9409e187b4fb0248aa;p=staging%2Fbasesystem.git

diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk
index 77d4512..9369fd3 100644
--- 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)
@@ -196,14 +193,14 @@ endef
 ## for libc ##
 AGLCPPFLAGS += -D_GNU_SOURCE
 
-## for libPosixBased001Legacy 
+## for libPosixBased001Legacy
 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
 
 ifneq ($(INST_SHLIBS),libagl_stub)
 AGLLDLIBS += -Wl,-Bdynamic -lpthread
@@ -213,8 +210,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
@@ -258,10 +255,10 @@ DEL_INFO = $(filter %.info, \
 SOBJS = $(DEL_SOBJS) $($(1)_PCOS)
 DEPS = $(join $(dir $(DEL_OBJS)),$(patsubst %.o,.%.d,$(notdir $(DEL_OBJS))))
 
-INST_TEST_MOCK_LIBS := 
-INST_TEST_MOCK_SHLIBS := 
-INST_ITV2_TESTPROGS := 
-INST_TESTPROGS := 
+INST_TEST_MOCK_LIBS :=
+INST_TEST_MOCK_SHLIBS :=
+INST_ITV2_TESTPROGS :=
+INST_TESTPROGS :=
 
 CLEAN_OBJS := $(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_OBJS,$(lib)))
 CLEAN_SOBJS := $(foreach lib,$(INST_SHLIBS) $(INST_TEST_MOCK_SHLIBS),$(call DEL_SOBJS,$(lib)))
@@ -269,15 +266,14 @@ 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))))
 
 LIB_DEPS := $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(INST_TEST_MOCK_LIBS) $(INST_TEST_MOCK_SHLIBS) $(NOINST_LIBS),$(call DEPS,$(lib)))
 PROG_DEPS := $(foreach prog,$(INST_PROGS),$(call DEPS,$(prog)))
-TESTPROGS_DEPS := 
+TESTPROGS_DEPS :=
 PROG_RULES := $(foreach prog,$(INST_PROGS),$(if $(prog),.$(prog).out.rule))
-TESTPROG_RULES := 
+TESTPROG_RULES :=
 
 LIB_RULES := $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(NOINST_LIBS) $(INST_TEST_MOCK_LIBS),$(if $($(lib)_SRCS),.$(lib).a.rule))
 SHLIB_RULES := $(foreach lib,$(INST_SHLIBS) $(INST_TEST_MOCK_SHLIBS),$(if $(lib),.$(lib).so.rule))
@@ -323,16 +319,10 @@ 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
-
 #################################################################################
 SUBDIRS := $(filter-out mock,$(SUBDIRS))
 
@@ -342,7 +332,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-%)
@@ -350,7 +339,7 @@ SUBDIRS := $(filter-out mock,$(SUBDIRS))
 .PHONY: install-prog $(SUBDIRS:%=install-prog-%)
 .PHONY: install-data $(SUBDIRS:%=install-data-%)
 .PHONY: install-cfg $(SUBDIRS:%=install-cfg-%)
-.PHONY: install-preload 
+.PHONY: install-preload
 .PHONY: clean-all
 .PHONY: clean-self
 .PHONY: clean-sub $(SUBDIRS:%=clean-%)
@@ -369,9 +358,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 +386,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 +429,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)/%)
 
 
@@ -515,7 +489,7 @@ endif
 .%.out.rule:
 	@echo '$*.out: $$(call OBJS,$*)' > $@
 	@echo '	@rm -f $$(@:%=.%.libdep)' >> $@
-	@echo '	$$(LINK) $$(AGLLDFLAGS) -Wl,-rpath=$$(RPATH) -Wl,-rpath-link=$$(RPATHLINK),-Map=$$(@:%.out=%.map) $$(call OBJS,$*) $($(*F)_LDLIBS) $$(AGLLDLIBS) -o $$@' >> $@
+	@echo '	$$(LINK) $$(AGLLDFLAGS) -Wl,-Map=$$(@:%.out=%.map) $$(call OBJS,$*) $($(*F)_LDLIBS) $$(AGLLDLIBS) -o $$@' >> $@
 	@echo '	@awk '\''$$$$1=="LOAD" && $$$$2~/\.a$$$$/{print("$$@:", $$$$2);print($$$$2 ":")}'\'' $$(@:%.out=%.map) > $$(@:%=.%.libdep)' >> $@
 
 .%.a.rule:
@@ -525,7 +499,7 @@ endif
 .%.so.rule:
 	@echo '$*.so: $$(call SOBJS,$*)' > $@
 	@echo '	$$(call INST_DUMMY,$*.so)' >> $@
-	@test -f $*.ver && echo '	$$(LINK_SHLIB) -shared $$(AGLLDFLAGS) $($(*F)_LDFLAGS) $$(AGLLDLIBS) -Wl,-rpath=$$(RPATH) -Wl,-soname=$*.so,-Map=$$(@:%.so=%.map),--version-script,$*.ver $$^ -o $$@' >> $@ || echo '	$$(LINK_SHLIB) -shared $$(AGLLDFLAGS) $($(*F)_LDFLAGS) $$(AGLLDLIBS) -Wl,-rpath=$$(RPATH) -Wl,-soname=$*.so,-Map=$$(@:%.so=%.map) $$^ -o $$@' >> $@
+	@test -f $*.ver && echo '	$$(LINK_SHLIB) -shared $$(AGLLDFLAGS) $($(*F)_LDFLAGS) $$(AGLLDLIBS) -Wl,-soname=$*.so,-Map=$$(@:%.so=%.map),--version-script,$*.ver $$^ -o $$@' >> $@ || echo '	$$(LINK_SHLIB) -shared $$(AGLLDFLAGS) $($(*F)_LDFLAGS) $$(AGLLDLIBS) -Wl,-soname=$*.so,-Map=$$(@:%.so=%.map) $$^ -o $$@' >> $@
 	@echo '	$$(call CLEAN_DUMMY)' >> $@
 
 .%.ipc.rule:
@@ -601,29 +575,29 @@ endif
 #################################################################################
 
 ifeq ($(MAKECMDGOALS),all)
--include $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 
 ifeq ($(MAKECMDGOALS),)
--include $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 
 ifeq ($(MAKECMDGOALS),install)
--include $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 ifeq ($(MAKECMDGOALS),install-test)
--include $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 ifeq ($(MAKECMDGOALS),install-test-exec)
--include $(PROG_RULES) $(TESTPROG_RULES) $(PROG_DEPS) $(TESTPROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(PROG_RULES) $(TESTPROG_RULES) $(PROG_DEPS) $(TESTPROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 
 ifeq ($(MAKECMDGOALS),test)
--include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 
 ifeq ($(MAKECMDGOALS),run-ct-local)
--include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 
 ifeq ($(MAKECMDGOALS),run-itv2-local)
@@ -631,17 +605,17 @@ ifeq ($(MAKECMDGOALS),run-itv2-local)
 endif
 
 ifeq ($(MAKECMDGOALS),run-ut-local)
--include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 
 ifeq ($(MAKECMDGOALS),run-it-local)
--include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 
 
 
 ifeq ($(MAKECMDGOALS),test-exec)
--include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES) 
+-include $(TESTPROG_RULES) $(PROG_RULES) $(PROG_DEPS) $(PROG_LIBDEPS) $(SHLIB_RULES) $(LIB_RULES) $(LIB_DEPS) $(ARLIB_RULES)
 endif
 
 
@@ -674,4 +648,3 @@ ifneq ($(IPC_API_RULES),)
 -include $(IPC_API_RULES) $(IPC_API_DEPS)
 endif
 endif
-