Changed the installation path of libraries

The libraries required by basesystem were deployed in /usr/lib/basesystem.
However, if the libraries were installed in this path, the executable would
not link the libraries. I changed the path of the librariesfrom
/usr/lib/basesystem to /usr/lib.

Signed-off-by: Shuhei AKETA <shuhei.aketa@woven-planet.global>
Change-Id: I174b29e96e1da9001f8c5308025abaaaeddc6342

1 files changed, 22 insertions, 27 deletions

diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk
index 3723ead..9369fd3 100644
--- a/agl-basefiles/share/agl.mk
+++ b/agl-basefiles/share/agl.mk
@@ -193,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=/usr/include/basesystem
 
 ## for agl library##
-AGLLDFLAGS += -L=/usr/lib/basesystem
+AGLLDFLAGS += -L=/usr/lib
 
 ifneq ($(INST_SHLIBS),libagl_stub)
 AGLLDLIBS += -Wl,-Bdynamic -lpthread
@@ -212,7 +212,7 @@ endif
 COMPONENT_NAME ?= $(error COMPONENT_NAME is not defined)
 AGL_TOPDIR ?= $(DESTDIR)/usr
 AGL_INCDIR := $(AGL_TOPDIR)/include/basesystem
-AGL_LIBDIR := $(AGL_TOPDIR)/lib/basesystem
+AGL_LIBDIR := $(AGL_TOPDIR)/lib
 AGL_BINDIR := $(AGL_TOPDIR)/bin
 AGL_PIXMAPDIR := $(AGL_TOPDIR)/pixmaps
 AGL_UCODEDIR := $(AGL_TOPDIR)/data/ucode
@@ -255,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)))
@@ -271,9 +271,9 @@ CLEAN_INFO := $(sort $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(INST_TEST_MOCK_
 
 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))
@@ -324,10 +324,6 @@ CLEAN_FILES += $(foreach lib,$(INST_SHLIBS) $(INST_PROGS),$(if $(lib),$(lib).map
 endif
 
 #################################################################################
-
-# RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/lib/basesystem
-
-#################################################################################
 SUBDIRS := $(filter-out mock,$(SUBDIRS))
 
 .PHONY: all all-subdirs install test $(SUBDIRS:%=all-%) $(SUBDIRS:%=install--%)
@@ -343,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-%)
@@ -493,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:
@@ -503,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:
@@ -579,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)
@@ -609,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
 
 
@@ -652,4 +648,3 @@ ifneq ($(IPC_API_RULES),)
 -include $(IPC_API_RULES) $(IPC_API_DEPS)
 endif
 endif
-