diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-11 12:25:59 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-11 16:44:26 +0200 |
| commit | 636da2b1e55c098b9c650f31c217c8f220abbebc (patch) | |
| tree | f84a742066e65492eb4f23ec7edb31ce4262336b /scp2 | |
| parent | 23e5debcc528132eedd7f1530216fe2b2158386a (diff) | |
autoinstall: allow to use only one variable listing all ids
Change-Id: I270ea16aedb22c1af765565657ee4069c03ac6f2
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstallLibs_ooo.mk | 2 | ||||
| -rw-r--r-- | scp2/AutoInstallLibs_ure.mk | 2 | ||||
| -rwxr-xr-x | scp2/source/ooo/ure.scp | 19 |
3 files changed, 3 insertions, 20 deletions
diff --git a/scp2/AutoInstallLibs_ooo.mk b/scp2/AutoInstallLibs_ooo.mk index 46ae5a5c6cab..dd628d584c3e 100644 --- a/scp2/AutoInstallLibs_ooo.mk +++ b/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: diff --git a/scp2/AutoInstallLibs_ure.mk b/scp2/AutoInstallLibs_ure.mk index 567db0e8918c..9c280bcc41e3 100644 --- a/scp2/AutoInstallLibs_ure.mk +++ b/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: diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 948c626bd425..bb80839ffb9a 100755 --- a/scp2/source/ooo/ure.scp +++ b/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, |