gbuild: rework AutoInstallLibs and autoinstall ure executables

Change-Id: I7312d94f90758d450a69410819c5e8c142756a47

2 files changed, 23 insertions, 16 deletions

diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk
index ab520d6c0183..aeb7c944ff8e 100644
--- a/solenv/gbuild/AutoInstallLibs.mk
+++ b/solenv/gbuild/AutoInstallLibs.mk
@@ -12,15 +12,19 @@
 $(dir $(call gb_AutoInstallLibs_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk
-	$(call gb_Output_announce,$*,$(true),AIL,3)
-	echo "/* autogenerated library installs for group $(INSTALLMODULE) */" > $@
-	echo "#define $(SCP2ID)_ALL \ " >> $@
-	$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
-		echo "    $(SCP2ID)_$(lib), \ " >> $@;)
+$(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_$(INSTALLMODULE)),\
-		echo "$(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
+	$(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,%) :
@@ -35,16 +39,16 @@ $(call gb_Helper_make_userfriendly_targets,all,AutoInstallLibs)
 
 endef
 
-define gb_AutoInstallLibs_add_category
+# 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)) : INSTALLMODULE = $(2)
-$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2TEMPLATE = $(3)
-$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2ID = $(4)
+$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2LIBTEMPLATE := $(2)
+$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2EXETEMPLATE := $(3)
 
 endef
 
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index d6af98003e04..cb51f503da7b 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -109,7 +109,6 @@ endef
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
 gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := BASE ONLINEUPDATE GRAPHICFILTER GNOME TDE IMPRESS KDE MATH OOO URE WRITER
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
 
 $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
@@ -148,6 +147,13 @@ gb_Executable_$(1) += $(2)
 
 endef
 
+define gb_Helper_register_executables_for_install
+$(call gb_Helper_register_executables,$(1),$(3))
+
+gb_Executable_MODULE_$(2) += $(3)
+
+endef
+
 define gb_Helper_register_libraries
 ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),)
 $$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid groups are: $$(gb_Library_VALIDGROUPS)))
@@ -166,9 +172,6 @@ endef
 # the first argument is the group, which sets rpaths etc.
 # the second argument is the install module, which describes in which distro package/msi a lib should show up
 define gb_Helper_register_libraries_for_install
-ifeq ($$(filter $(2),$$(gb_Library_VALIDINSTALLMODULES)),)
-$$(eval $$(call gb_Output_error,$(2) is not a valid install module for libraries. Valid groups are: $$(gb_Library_VALIDINSTALLMODULES)))
-endif
 $(call gb_Helper_register_libraries,$(1),$(3))
 
 gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(3))