gbuild: s/AutoInstallLibs/AutoInstall/g

Change-Id: I582a841ea3b2a882cbdc1556058b007a8667024a

5 files changed, 59 insertions, 59 deletions

diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
new file mode 100644
index 000000000000..518d06e71e02
--- /dev/null
+++ b/solenv/gbuild/AutoInstall.mk
@@ -0,0 +1,55 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# AutoInstall class
+
+$(dir $(call gb_AutoInstall_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstall.mk
+	$(call gb_Output_announce,$*,$(true),AIN,3)
+	echo "/* autogenerated installs for group $* */" > $@
+	echo "#define auto_$*_ALL \ " >> $@
+	$(foreach lib,$(gb_Library_MODULE_$*),\
+		echo "    auto_$*_lib_$(lib), \ " >> $@;)
+	$(foreach exe,$(gb_Executable_MODULE_$*),\
+		echo "    auto_$*_exe_$(exe), \ " >> $@;)
+	echo "" >> $@
+	$(foreach lib,$(gb_Library_MODULE_$*),\
+		echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
+	$(foreach exe,$(gb_Executable_MODULE_$*),\
+		echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(exe)$(gb_Executable_EXT))" >> $@;)
+
+
+$(call gb_AutoInstall_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),AIL,3)
+	rm -f $(call gb_AutoInstall_get_target,$*)
+
+define gb_AutoInstall_AutoInstall
+$(call gb_AutoInstall_get_target,all) :| $(dir $(call gb_AutoInstall_get_target,all)).dir
+
+$$(eval $$(call gb_Module_register_target,$(call gb_AutoInstall_get_target,all),$(call gb_AutoInstall_get_clean_target,all)))
+$(call gb_Helper_make_userfriendly_targets,all,AutoInstall)
+
+endef
+
+# gb_AutoInstall_add_module module lib_template optional:exe_template
+define gb_AutoInstall_add_module
+$(call gb_AutoInstall_get_target,all) : $(call gb_AutoInstall_get_target,$(1))
+$(call gb_AutoInstall_get_clean_target,all) : $(call gb_AutoInstall_get_clean_target,$(1))
+$(call gb_Helper_make_userfriendly_targets,$(1),AutoInstall)
+
+$(call gb_AutoInstall_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
+$(call gb_AutoInstall_get_target,$(1)) :| $(dir $(call gb_AutoInstall_get_target,$(1))).dir
+$(call gb_AutoInstall_get_target,$(1)) : SCP2LIBTEMPLATE := $(2)
+$(call gb_AutoInstall_get_target,$(1)) : SCP2EXETEMPLATE := $(3)
+
+endef
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk
deleted file mode 100644
index aeb7c944ff8e..000000000000
--- a/solenv/gbuild/AutoInstallLibs.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# AutoInstallLibs class
-
-$(dir $(call gb_AutoInstallLibs_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstallLibs.mk
-	$(call gb_Output_announce,$*,$(true),AIN,3)
-	echo "/* autogenerated installs for group $* */" > $@
-	echo "#define auto_$*_ALL \ " >> $@
-	$(foreach lib,$(gb_Library_MODULE_$*),\
-		echo "    auto_$*_lib_$(lib), \ " >> $@;)
-	$(foreach exe,$(gb_Executable_MODULE_$*),\
-		echo "    auto_$*_exe_$(exe), \ " >> $@;)
-	echo "" >> $@
-	$(foreach lib,$(gb_Library_MODULE_$*),\
-		echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
-	$(foreach exe,$(gb_Executable_MODULE_$*),\
-		echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(exe)$(gb_Executable_EXT))" >> $@;)
-
-
-$(call gb_AutoInstallLibs_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),AIL,3)
-	rm -f $(call gb_AutoInstallLibs_get_target,$*)
-
-define gb_AutoInstallLibs_AutoInstallLibs
-$(call gb_AutoInstallLibs_get_target,all) :| $(dir $(call gb_AutoInstallLibs_get_target,all)).dir
-
-$$(eval $$(call gb_Module_register_target,$(call gb_AutoInstallLibs_get_target,all),$(call gb_AutoInstallLibs_get_clean_target,all)))
-$(call gb_Helper_make_userfriendly_targets,all,AutoInstallLibs)
-
-endef
-
-# gb_AutoInstallLibs_add_module module lib_template optional:exe_template
-define gb_AutoInstallLibs_add_module
-$(call gb_AutoInstallLibs_get_target,all) : $(call gb_AutoInstallLibs_get_target,$(1))
-$(call gb_AutoInstallLibs_get_clean_target,all) : $(call gb_AutoInstallLibs_get_clean_target,$(1))
-$(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs)
-
-$(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
-$(call gb_AutoInstallLibs_get_target,$(1)) :| $(dir $(call gb_AutoInstallLibs_get_target,$(1))).dir
-$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2LIBTEMPLATE := $(2)
-$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2EXETEMPLATE := $(3)
-
-endef
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 0ef0780ed10a..d4cf4c9d030d 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -256,7 +256,7 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 endef
 
 define gb_InstallModuleTarget_use_auto_install_libs
-$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_AutoInstallLibs_get_target,$(2))
+$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_AutoInstall_get_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 72c2fa10aaef..e87efe3bf770 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -63,7 +63,7 @@ endef
 
 # workdir target patterns
 
-gb_AutoInstallLibs_get_target = $(WORKDIR)/AutoInstallLibs/$(1)
+gb_AutoInstall_get_target = $(WORKDIR)/AutoInstall/$(1)
 gb_AllLangHelp_get_target = $(WORKDIR)/AllLangHelp/$(1)
 gb_AllLangPackage_get_target = $(WORKDIR)/AllLangPackage/$(1)
 gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
@@ -233,7 +233,7 @@ $(WORKDIR)/Headers/StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
 endef
 
 $(eval $(call gb_Helper_make_clean_targets,\
-	AutoInstallLibs \
+	AutoInstall \
 	AllLangHelp \
 	AllLangPackage \
 	AllLangResTarget \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 4b65f0ecee83..47d6e6e9727e 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -336,7 +336,7 @@ include $(foreach class, \
 	InstallModuleTarget \
 	InstallModule \
 	InstallScript \
-	AutoInstallLibs \
+	AutoInstall \
 	PackageSet \
 	GeneratedPackage \
 ,$(GBUILDDIR)/$(class).mk)