autoinstall: allow to use only one variable listing all ids

Change-Id: I270ea16aedb22c1af765565657ee4069c03ac6f2

scp2/AutoInstallLibs_ooo.mk

@@ -7,6 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,LIBO_LIB_FILE(auto_File_Lib_$$(1),$$(call gb_Library_get_runtime_filename,$$(1)))))
+$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,LIBO_LIB_FILE,auto_File_Lib))
 
 # vim: set noet sw=4 ts=4:

scp2/AutoInstallLibs_ure.mk

@@ -7,6 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ure,URE,URE_PRIVATE_LIB(auto_Ure_Private_Lib_$$(1),$$(call gb_Library_get_runtime_filename,$$(1)))))
+$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ure,URE,URE_PRIVATE_LIB,auto_Ure_Private_Lib))
 
 # vim: set noet sw=4 ts=4:

scp2/source/ooo/ure.scp

@@ -832,24 +832,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_Unixlink_File_Dl_Store,
             gid_Unixlink_File_Dl_Jvmaccess,
             gid_Unixlink_File_Dl_Jvmfwk,
-            auto_Ure_Private_Lib_affine_uno,
-            auto_Ure_Private_Lib_gcc3_uno,
-            auto_Ure_Private_Lib_java_uno,
-            auto_Ure_Private_Lib_juh,
-            auto_Ure_Private_Lib_juhx,
-            auto_Ure_Private_Lib_jvmaccess,
-            auto_Ure_Private_Lib_jvmfwk,
-            auto_Ure_Private_Lib_log_uno,
-            auto_Ure_Private_Lib_msci_uno,
-            auto_Ure_Private_Lib_mscx_uno,
-            auto_Ure_Private_Lib_reg,
-            auto_Ure_Private_Lib_sal_textenc,
-            auto_Ure_Private_Lib_store,
-            auto_Ure_Private_Lib_sunjavaplugin,
-            auto_Ure_Private_Lib_unoidl,
-            auto_Ure_Private_Lib_unsafe_uno,
-            auto_Ure_Private_Lib_urelibs,
-            auto_Ure_Private_Lib_xmlreader,
+            auto_Ure_Private_Lib_ALL,
             gid_File_Dl_JrepropertiesClass,
             gid_File_Dl_Profile_Jvmfwk3rc,
             gid_File_Dl_Jpipe,

solenv/gbuild/AutoInstallLibs.mk

@@ -17,8 +17,12 @@ $(call gb_AutoInstallLibs_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),AIL,3)
 	echo "/* autogenerated library installs for group $(INSTALLMODULE) */" > $@
 	$(call gb_Output_info,install module: $(INSTALLMODULE) contents: $(gb_Library_MODULE_$(INSTALLMODULE)))
+	echo "#define $(SCP2ID)_ALL \ " >> $@
 	$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
-		echo "$(call SCP2TEMPLATE,$(lib))" >> $@;)
+		echo "    $(SCP2ID)_$(lib) \ " >> $@;)
+	echo "" >> $@
+	$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
+		echo "$(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
 
 
 $(call gb_AutoInstallLibs_get_clean_target,%) :
@@ -29,6 +33,7 @@ define gb_AutoInstallLibs_AutoInstallLibs
 $(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Helper_PHONY) | $(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)
 
 $$(eval $$(call gb_Module_register_target,$(call gb_AutoInstallLibs_get_target,$(1)),$(call gb_AutoInstallLibs_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs)