gbuild should use SRCDIR as per GNU make conventions

7 files changed, 23 insertions, 23 deletions

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 3506a6334d5c..5e0f89acdab0 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -66,7 +66,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 
 endef
 
-$(call gb_SrsPartMergeTarget_get_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET)
 	$(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p $(dir $@) && cp $< $@)
 
 
@@ -92,12 +92,12 @@ $(call gb_Helper_abbreviate_dirs_native,\
 
 endef
 
-$(call gb_SrsPartTarget_get_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartTarget_RSCTARGET)
+$(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartTarget_RSCTARGET)
 	$(call gb_SrsPartTarget__command_dep,$*,$<)
 	$(call gb_SrsPartTarget__command,$@,$*,$<)
 
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsPartTarget_get_dep_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY)
+$(call gb_SrsPartTarget_get_dep_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
 		echo '$(call gb_SrsPartTarget_get_target,$*) : $(gb_Helper_PHONY)' > $@)
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index b0233c83eb83..47b9f0f2b616 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -50,10 +50,10 @@ $(call gb_ComponentTarget_get_clean_target,%) :
 # creates 2 componentfiles: the first is for the installation set,
 # the second is for using the component during the build.
 # bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
-$(call gb_ComponentTarget_get_inbuild_target,%) : $(call gb_ComponentTarget_get_source,$(SOLARSRC),%) | $(gb_XSLTPROCTARGET)
+$(call gb_ComponentTarget_get_inbuild_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET)
 	$(call gb_ComponentTarget__command,$@,$<,$*)
 
-$(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SOLARSRC),%) | $(gb_XSLTPROCTARGET)
+$(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET)
 	$(call gb_ComponentTarget__command,$@,$<,$*)
 
 $(call gb_ComponentTarget_get_target,%) :
diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index c0cff41b6148..4fe079361c22 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -100,9 +100,9 @@ define gb_ExternalLib__command_autotools
 	rm -fr $(call gb_ExternalLib_get_workdir,$(1)) && \
 	mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \
 	$(GNUTAR) -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \
-	cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(SOLARSRC)/$$p || exit 1; done && \
+	cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(SRCDIR)/$$p || exit 1; done && \
 	CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig" ./configure $(if $(findstring YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
-	for p in $(T_POST_PATCHES) ; do patch -p 1 < $(SOLARSRC)/$p || exit 1; done
+	for p in $(T_POST_PATCHES) ; do patch -p 1 < $(SRCDIR)/$p || exit 1; done
 	#we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ?
 	cd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i -e 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i -e 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi
 	+MAKEFLAGS=$(filterout r,$(MAKEFLAGS)) $(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 5a4737ab7307..bcc701a2190a 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -123,7 +123,7 @@ gb_CObject_get_source = $(1)/$(2).c
 # defined by platform
 #  gb_CObject__command
 
-$(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SOLARSRC),%)
+$(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%)
 	$(call gb_CObject__command,$@,$*,$<,$(call gb_CObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -169,7 +169,7 @@ endif
 endif
 endef
 
-$(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SOLARSRC),%)
+$(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SRCDIR),%)
 	$(eval $(gb_CxxObject__set_pchflags))
 	$(call gb_CxxObject__command,$@,$*,$<,$(call gb_CxxObject_get_dep_target,$*))
 
@@ -234,8 +234,8 @@ gb_YaccObject__get_generated_source = $(WORKDIR)/$(1).cxx
 define gb_YaccObject_YaccObject
 $(call gb_YaccObject_get_target,$(1)) : $(call gb_YaccObject__get_generated_source,$(1)) $(call gb_YaccObject_get_header_target,$(1))
 $(call gb_YaccObject_get_header_target,$(1)) :| $(call gb_YaccObject__get_generated_source,$(1))
-$(call gb_YaccObject__get_generated_source,$(1)) : $(call gb_YaccObject_get_source,$(SOLARSRC),$(1))
-	$(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SOLARSRC),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
+$(call gb_YaccObject__get_generated_source,$(1)) : $(call gb_YaccObject_get_source,$(SRCDIR),$(1))
+	$(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SRCDIR),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
 endef
 
 gb_YACC := bison
@@ -280,11 +280,11 @@ else
 gb_ObjCObject__command_dep =
 endif
 
-$(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SOLARSRC),%)
+$(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
 	$(call gb_ObjCObject__command,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE))
 
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_source,$(SOLARSRC),%)
+$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
 	$(call gb_ObjCObject__command_dep,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE))
 endif
 
@@ -298,7 +298,7 @@ gb_ObjCObject_ObjCObject =
 #  gb_AsmObject_get_source (.asm on Windows, .s elsewhere)
 #  gb_AsmObject__command
 
-$(call gb_AsmObject_get_target,%) : $(call gb_AsmObject_get_source,$(SOLARSRC),%)
+$(call gb_AsmObject_get_target,%) : $(call gb_AsmObject_get_source,$(SRCDIR),%)
 	$(call gb_AsmObject__command,$@,$*,$<,$(call gb_AsmObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 03dd8ef132c1..816fb85adc63 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -66,7 +66,7 @@ endef
 define gb_UnoApiTarget_add_idlfiles
 $(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl)))
 
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : $(foreach idl,$(3),$(SOLARSRC)/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : $(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
 	$(gb_UnoApiPartTarget__command)
 
 endef
@@ -86,7 +86,7 @@ endef
 define gb_UnoApiTarget_add_idlfiles_noheader
 $(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(2),$(idl)))
 
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : $(foreach idl,$(3),$(SOLARSRC)/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : $(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
 	$(gb_UnoApiPartTarget__command)
 
 endef
@@ -101,7 +101,7 @@ endef
 define gb_UnoApiTarget_add_idlfiles_nohdl
 $(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(2),$(idl)))
 
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : $(foreach idl,$(3),$(SOLARSRC)/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : $(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
 	$(gb_UnoApiPartTarget__command)
 
 endef
@@ -141,7 +141,7 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$
 endef
 
 define gb_UnoApiTarget_add_reference_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SOLARSRC)/$(strip $(2)).rdb
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb
 
 endef
 
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 931b8bd210c9..234ab2dfac28 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -60,13 +60,13 @@ endef
 
 define gb_WinResTarget_add_file
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE=$(gb_Helper_SRCDIR_NATIVE)/$(2).rc
-$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(realpath $(SOLARSRC)/$(strip $(2)).rc)
-$(call gb_WinResTarget_get_target,$(1)) : $(realpath $(SOLARSRC)/$(strip $(2)).rc)
+$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(realpath $(SRCDIR)/$(strip $(2)).rc)
+$(call gb_WinResTarget_get_target,$(1)) : $(realpath $(SRCDIR)/$(strip $(2)).rc)
 
 endef
 
 define gb_WinResTarget_add_dependency
-$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(realpath $(SOLARSRC)/$(strip $(file))))
+$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(realpath $(SRCDIR)/$(strip $(file))))
 
 endef
 
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index fb3ab0930385..96044f94bceb 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -152,7 +152,7 @@ include $(GBUILDDIR)/Helper.mk
 include $(GBUILDDIR)/TargetLocations.mk
 
 $(eval $(call gb_Helper_init_registries))
-$(eval $(call gb_Helper_add_repositories,$(SOLARSRC)))
+$(eval $(call gb_Helper_add_repositories,$(SRCDIR)))
 $(eval $(call gb_Helper_collect_libtargets))
 
 gb_Library_DLLPOSTFIX := lo
@@ -194,7 +194,7 @@ endif
 
 include $(GBUILDDIR)/Tempfile.mk
 
-include $(SOLARSRC)/RepositoryFixes.mk
+include $(SRCDIR)/RepositoryFixes.mk
 
 $(eval $(call gb_Helper_collect_knownlibs))