gbuild: s/AutoInstallLibs/AutoInstall/g

Change-Id: I582a841ea3b2a882cbdc1556058b007a8667024a

Makefile.in

@@ -100,7 +100,7 @@ $(eval $(call gbuild_modules_rules,$(gbuild_modules)))
 gbuild_TARGETS := AllLangHelp \
 	AllLangPackage \
 	AllLangResTarget \
-	AutoInstallLibs \
+	AutoInstall \
 	CliLibrary \
 	CliNativeLibrary \
 	CliUnoApiTarget \

scp2/AutoInstallLibs.mk → scp2/AutoInstall.mk

@@ -7,18 +7,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AutoInstallLibs_AutoInstallLibs))
+$(eval $(call gb_AutoInstall_AutoInstall))
 
-$(eval $(call gb_AutoInstallLibs_add_module,base,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,gnome,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,graphicfilter,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,impress,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,kde,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,math,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,onlineupdate,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,ooo,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,tde,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
-$(eval $(call gb_AutoInstallLibs_add_module,writer,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
 
 # vim: set noet sw=4 ts=4:

scp2/Module_scp2.mk

@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,scp2))
 
 $(eval $(call gb_Module_add_targets,scp2,\
-	AutoInstallLibs \
+	AutoInstall \
 	CustomTarget_langmacros \
 	InstallModule_accessories \
 	InstallModule_base \

scp2/source/base/module_base.scp

@@ -18,7 +18,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/base"
+#include "AutoInstall/base"
 
 Module gid_Module_Prg_Base
     MOD_NAME_DESC(MODULE_PRG_BASE);

scp2/source/gnome/module_gnome.scp

@@ -18,7 +18,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/gnome"
+#include "AutoInstall/gnome"
 
 Module gid_Module_Optional_Gnome
     ParentID = gid_Module_Optional;

scp2/source/graphicfilter/module_graphicfilter.scp

@@ -18,7 +18,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/graphicfilter"
+#include "AutoInstall/graphicfilter"
 
 Module gid_Module_Optional_Grfflt
     PackageInfo = "packinfo_office.txt";

scp2/source/impress/module_impress.scp

@@ -18,7 +18,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/impress"
+#include "AutoInstall/impress"
 
 Module gid_Module_Prg_Impress
     MOD_NAME_DESC ( MODULE_PRG_IMPRESS );

scp2/source/kde/module_kde.scp

@@ -18,7 +18,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/kde"
+#include "AutoInstall/kde"
 
 Module gid_Module_Optional_Kde
     ParentID = gid_Module_Optional;

scp2/source/math/module_math.scp

@@ -18,7 +18,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/math"
+#include "AutoInstall/math"
 
 Module gid_Module_Prg_Math
     MOD_NAME_DESC ( MODULE_PRG_MATH );

scp2/source/onlineupdate/module_onlineupdate.scp

@@ -18,7 +18,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/onlineupdate"
+#include "AutoInstall/onlineupdate"
 
 Module gid_Module_Optional_Onlineupdate
     PackageInfo = "packinfo_office.txt";

scp2/source/ooo/module_hidden_ooo.scp

@@ -17,7 +17,7 @@
  */
 
 #include "macros.inc"
-#include "AutoInstallLibs/ooo"
+#include "AutoInstall/ooo"
 
 #ifdef AIX
 #ifndef SYSTEM_CURL

scp2/source/ooo/ure.scp

@@ -18,7 +18,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/ure"
+#include "AutoInstall/ure"
 
 Directory gid_Dir_Ure_Bin
 #if defined MACOSX

scp2/source/tde/module_tde.scp

@@ -11,7 +11,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/tde"
+#include "AutoInstall/tde"
 
 Module gid_Module_Optional_Tde
     ParentID = gid_Module_Optional;

scp2/source/writer/module_writer.scp

@@ -18,7 +18,7 @@
 
 #include "macros.inc"
 
-#include "AutoInstallLibs/writer"
+#include "AutoInstall/writer"
 
 Module gid_Module_Prg_Wrt
     MOD_NAME_DESC(MODULE_PRG_WRT);

solenv/gbuild/AutoInstallLibs.mk → solenv/gbuild/AutoInstall.mk

@@ -7,12 +7,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# AutoInstallLibs class
+# AutoInstall class
 
-$(dir $(call gb_AutoInstallLibs_get_target,%)).dir :
+$(dir $(call gb_AutoInstall_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstallLibs.mk
+$(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 \ " >> $@
@@ -27,28 +27,28 @@ $(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/A
 		echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(exe)$(gb_Executable_EXT))" >> $@;)
 
 
-$(call gb_AutoInstallLibs_get_clean_target,%) :
+$(call gb_AutoInstall_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),AIL,3)
-	rm -f $(call gb_AutoInstallLibs_get_target,$*)
+	rm -f $(call gb_AutoInstall_get_target,$*)
 
-define gb_AutoInstallLibs_AutoInstallLibs
-$(call gb_AutoInstallLibs_get_target,all) :| $(dir $(call gb_AutoInstallLibs_get_target,all)).dir
+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_AutoInstallLibs_get_target,all),$(call gb_AutoInstallLibs_get_clean_target,all)))
-$(call gb_Helper_make_userfriendly_targets,all,AutoInstallLibs)
+$$(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_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)
+# 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_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)
+$(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
 

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
 

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 \

solenv/gbuild/gbuild.mk

@@ -336,7 +336,7 @@ include $(foreach class, \
 	InstallModuleTarget \
 	InstallModule \
 	InstallScript \
-	AutoInstallLibs \
+	AutoInstall \
 	PackageSet \
 	GeneratedPackage \
 ,$(GBUILDDIR)/$(class).mk)