fdo#67313: Use "lo" suffix for private URE libs

...(like is done for most of LO's non-URE libs already) to reduce likelihood of
name clashes, esp. on Windows where URE libs are found via PATH.

This introduces PRIVATELIBS_URE, and [does not remove not-yet]-unused UNOLIBS_URE.

(cherry picked from commit 644c33a857c46d540202189228f519946dc33833)
Conflicts:
	Repository.mk
	solenv/gbuild/Helper.mk
	solenv/gbuild/platform/IOS_ARM_GCC.mk
	solenv/gbuild/platform/WNT_INTEL_GCC.mk
	solenv/gbuild/platform/android.mk
	solenv/gbuild/platform/com_MSC_class.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/mingw.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/unxgcc.mk

Change-Id: Ib95dd45f18de140a54e62d632dbf2239f83c232e
Reviewed-on: https://gerrit.libreoffice.org/5667
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

17 files changed, 96 insertions, 81 deletions

diff --git a/Repository.mk b/Repository.mk
index d0de1d8edbb0..e0d4d7c0db80 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -451,21 +451,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \
 	$(if $(SOLAR_JAVA),java_uno) \
 	$(if $(SOLAR_JAVA),juh) \
 	$(if $(SOLAR_JAVA),juhx) \
-	$(if $(SOLAR_JAVA),jvmaccess) \
-	$(if $(SOLAR_JAVA),jvmfwk) \
 	log_uno \
-	reg \
-	sal_textenc \
-	store \
-	$(if $(SOLAR_JAVA),sunjavaplugin) \
-	unoidl \
 	unsafe_uno \
 	$(if $(URELIBS),urelibs) \
-	xmlreader \
 	$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
 ))
 
-$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,URE, \
+$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,URE, \
 	acceptor \
 	binaryurp \
 	bootstrap \
@@ -475,14 +467,22 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,URE, \
 	invocation \
 	$(if $(SOLAR_JAVA),javaloader) \
 	$(if $(SOLAR_JAVA),javavm) \
+	$(if $(SOLAR_JAVA),jvmaccess) \
+	$(if $(SOLAR_JAVA),jvmfwk) \
 	namingservice \
 	proxyfac \
 	reflection \
+	reg \
+	sal_textenc \
 	stocservices \
+	store \
 	streams \
+	$(if $(SOLAR_JAVA),sunjavaplugin) \
 	textinstream \
 	textoutstream \
+	unoidl \
 	uuresolver \
+	xmlreader \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 2453492ff535..bfd80e0a926a 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -38,9 +38,9 @@
  </vendorInfos>
 
  <plugins>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
-  <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
-  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
+  <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
+  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 2ff994675229..311bf8146c0f 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -44,11 +44,11 @@
  </vendorInfos>
 
  <plugins>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
-  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
-  <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
-  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
-  <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
+  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
+  <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
+  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
+  <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 172b570a67cc..aa8b423a348e 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -34,8 +34,8 @@
  </vendor>
  </vendorInfos>
  <plugins>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
-  <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
-  <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.dylib</library>
+  <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.dylib</library>
+  <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.dylib</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
index 8b847b95459e..9bc0c4119da4 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
@@ -46,7 +46,7 @@ look like.
  </vendorInfos>
 
  <plugins>
-  <library vendor="Sun Microsystems Inc.">libsunjavaplugin.dll</library>
+  <library vendor="Sun Microsystems Inc.">libsunjavapluginlo.dll</library>
   <library vendor="VendorX">./pluginDir/vendorx.dll</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 8430a010b867..e9bbd68887fc 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -32,7 +32,7 @@
  </vendorInfos>
 
  <plugins>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index e48037f697df..5b33aad6a777 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -35,8 +35,8 @@
  </vendorInfos>
 
  <plugins>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
-  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavapluginlo.dll</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavapluginlo.dll</library>
+  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavapluginlo.dll</library>
  </plugins>
 </javaSelection>
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 06821a363e55..68d2f8bf8ecf 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -380,7 +380,8 @@ void SAL_CALL thisModule() {}
 class FullTextEncodingData: private boost::noncopyable {
 public:
     FullTextEncodingData() {
-        if (!module_.loadRelative(&thisModule, SAL_MODULENAME("sal_textenc"))) {
+        if (!module_.loadRelative(&thisModule, SAL_MODULENAME("sal_textenclo")))
+        {
             SAL_WARN( "sal.textenc", "Loading sal_textenc library failed" );
             std::abort();
         }
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index b7baea732ff5..aac67b7699ed 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -108,7 +108,7 @@ 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_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO PRIVATELIBS_URE RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
 gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index e81026e9bc28..3c8c8399a194 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -168,6 +168,7 @@ gb_Library_FILENAMES := \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -178,6 +179,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 35706c14a1fe..072e33d4e847 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -213,6 +213,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
@@ -223,6 +224,7 @@ gb_Library_FILENAMES :=\
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(lib)$(gb_Library_OOOEXT)) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT)) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -234,6 +236,7 @@ gb_Library_DLLFILENAMES :=\
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(lib)$(gb_Library_OOODLLEXT)) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index 0161f9797f73..8f2685609cf2 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -76,6 +76,7 @@ gb_Library_FILENAMES := \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT)) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -90,6 +91,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 2283114f075c..1fb09d4f6469 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -262,6 +262,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
@@ -283,6 +284,7 @@ gb_Library_DLLFILENAMES :=\
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(lib)$(gb_Library_OOOEXT)) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4bbe6a52d6b9..a0843bdcfdc0 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -215,6 +215,7 @@ gb_Library_FILENAMES := \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -226,6 +227,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index ed0dd5cf08e8..30055c336aaf 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -248,6 +248,7 @@ gb_Library_FILENAMES := \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -258,6 +259,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index e68371d9976a..4fa4afa67321 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -248,6 +248,7 @@ gb_Library_FILENAMES := \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -258,6 +259,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
diff --git a/ure/source/README b/ure/source/README
index 345a3e7742aa..88c44924b387 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -48,14 +48,13 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/bin/startup.sh  [private]
 /opt/openoffice.org/ure/bin/uno.bin  [private]
 /opt/openoffice.org/ure/lib/unorc  [private]
-/opt/openoffice.org/ure/lib/libreg.so.3  [private]
-/opt/openoffice.org/ure/lib/libstore.so.3  [private]
-/opt/openoffice.org/ure/lib/libunoidl.so  [private]
-/opt/openoffice.org/ure/lib/libxmlreader.so  [private]
-/opt/openoffice.org/ure/lib/libjvmaccessgcc3.so.3  [private; Linux x86 only]
-/opt/openoffice.org/ure/lib/libjvmaccessC52.so.3  [private; Solaris only]
-/opt/openoffice.org/ure/lib/libjvmfwk.so.3  [private]
-/opt/openoffice.org/ure/lib/libsunjavaplugin.so  [private]
+/opt/openoffice.org/ure/lib/libreglo.so  [private]
+/opt/openoffice.org/ure/lib/libstorelo.so  [private]
+/opt/openoffice.org/ure/lib/libunoidllo.so  [private]
+/opt/openoffice.org/ure/lib/libxmlreaderlo.so  [private]
+/opt/openoffice.org/ure/lib/libjvmaccesslo.so  [private]
+/opt/openoffice.org/ure/lib/libjvmfwklo.so  [private]
+/opt/openoffice.org/ure/lib/libsunjavapluginlo.so  [private]
 /opt/openoffice.org/ure/lib/JREProperties.class  [private]
 /opt/openoffice.org/ure/lib/jvmfwk3rc  [private]
 /opt/openoffice.org/ure/lib/libgcc3_uno.so  [private; Linux x86 only]
@@ -67,24 +66,24 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/libjpipe.so  [private]
 /opt/openoffice.org/ure/lib/libjuh.so  [private]
 /opt/openoffice.org/ure/lib/libjuhx.so  [private]
-/opt/openoffice.org/ure/lib/libsal_textenc.so  [private]
-/opt/openoffice.org/ure/lib/acceptor.uno.so  [private]
-/opt/openoffice.org/ure/lib/binaryurp.uno.so  [private]
-/opt/openoffice.org/ure/lib/bootstrap.uno.so  [private]
-/opt/openoffice.org/ure/lib/connector.uno.so  [private]
-/opt/openoffice.org/ure/lib/introspection.uno.so  [private]
-/opt/openoffice.org/ure/lib/invocadapt.uno.so  [private]
-/opt/openoffice.org/ure/lib/invocation.uno.so  [private]
-/opt/openoffice.org/ure/lib/javaloader.uno.so  [private]
-/opt/openoffice.org/ure/lib/javavm.uno.so  [private]
-/opt/openoffice.org/ure/lib/namingservice.uno.so  [private]
-/opt/openoffice.org/ure/lib/proxyfac.uno.so  [private]
-/opt/openoffice.org/ure/lib/reflection.uno.so  [private]
-/opt/openoffice.org/ure/lib/streams.uno.so  [private]
-/opt/openoffice.org/ure/lib/textinstream.uno.so  [private]
-/opt/openoffice.org/ure/lib/textoutstream.uno.so  [private]
-/opt/openoffice.org/ure/lib/stocservices.uno.so  [private]
-/opt/openoffice.org/ure/lib/uuresolver.uno.so  [private]
+/opt/openoffice.org/ure/lib/libsal_textenclo.so  [private]
+/opt/openoffice.org/ure/lib/libacceptorlo.so  [private]
+/opt/openoffice.org/ure/lib/libbinaryurplo.so  [private]
+/opt/openoffice.org/ure/lib/libbootstraplo.so  [private]
+/opt/openoffice.org/ure/lib/libconnectorlo.so  [private]
+/opt/openoffice.org/ure/lib/libintrospectionlo.so  [private]
+/opt/openoffice.org/ure/lib/libinvocadaptlo.so  [private]
+/opt/openoffice.org/ure/lib/libinvocationlo.so  [private]
+/opt/openoffice.org/ure/lib/libjavaloaderlo.so  [private]
+/opt/openoffice.org/ure/lib/libjavavmlo.so  [private]
+/opt/openoffice.org/ure/lib/libnamingservicelo.so  [private]
+/opt/openoffice.org/ure/lib/libproxyfaclo.so  [private]
+/opt/openoffice.org/ure/lib/libreflectionlo.so  [private]
+/opt/openoffice.org/ure/lib/libstreamslo.so  [private]
+/opt/openoffice.org/ure/lib/libtextinstreamlo.so  [private]
+/opt/openoffice.org/ure/lib/libtextoutstreamlo.so  [private]
+/opt/openoffice.org/ure/lib/libstocserviceslo.so  [private]
+/opt/openoffice.org/ure/lib/libuuresolverlo.so  [private]
 /opt/openoffice.org/ure/share/java/java_uno.jar  [private]
 /opt/openoffice.org/ure/share/misc/javavendors.xml  [private]
 
@@ -109,13 +108,13 @@ Program Files\URE\misc\types.rdb
 Program Files\URE\misc\services.rdb
 Program Files\URE\bin\libxml2.dll  [external]
 Program Files\URE\bin\uno.ini  [private]
-Program Files\URE\bin\reg3.dll  [private]
-Program Files\URE\bin\store3.dll  [private]
-Program Files\URE\bin\unoidl.dll  [private]
-Program Files\URE\bin\xmlreader.dll  [private]
-Program Files\URE\bin\jvmaccess3MSC.dll  [private]
-Program Files\URE\bin\jvmfwk3.dll  [private]
-Program Files\URE\bin\libsunjavaplugin.dll  [private]
+Program Files\URE\bin\reglo.dll  [private]
+Program Files\URE\bin\storelo.dll  [private]
+Program Files\URE\bin\unoidllo.dll  [private]
+Program Files\URE\bin\xmlreaderlo.dll  [private]
+Program Files\URE\bin\jvmaccesslo.dll  [private]
+Program Files\URE\bin\jvmfwklo.dll  [private]
+Program Files\URE\bin\sunjavapluginlo.dll  [private]
 Program Files\URE\bin\JREProperties.class  [private]
 Program Files\URE\bin\jvmfwk3.ini  [private]
 Program Files\URE\bin\msci_uno.dll  [private]
@@ -128,24 +127,24 @@ Program Files\URE\bin\jpipe.dll  [private]
 Program Files\URE\bin\jpipx.dll  [private]
 Program Files\URE\bin\juh.dll  [private]
 Program Files\URE\bin\juhx.dll  [private]
-Program Files\URE\bin\sal_textenc.dll  [private]
-Program Files\URE\bin\acceptor.uno.dll  [private]
-Program Files\URE\bin\binaryurp.uno.dll  [private]
-Program Files\URE\bin\bootstrap.uno.dll  [private]
-Program Files\URE\bin\connector.uno.dll  [private]
-Program Files\URE\bin\introspection.uno.dll  [private]
-Program Files\URE\bin\invocadapt.uno.dll  [private]
-Program Files\URE\bin\invocation.uno.dll  [private]
-Program Files\URE\bin\javaloader.uno.dll  [private]
-Program Files\URE\bin\javavm.uno.dll  [private]
-Program Files\URE\bin\namingservice.uno.dll  [private]
-Program Files\URE\bin\proxyfac.uno.dll  [private]
-Program Files\URE\bin\reflection.uno.dll  [private]
-Program Files\URE\bin\streams.uno.dll  [private]
-Program Files\URE\bin\textinstream.uno.dll  [private]
-Program Files\URE\bin\textoutstream.uno.dll  [private]
-Program Files\URE\bin\stocservices.uno.dll  [private]
-Program Files\URE\bin\uuresolver.uno.dll  [private]
+Program Files\URE\bin\sal_textenclo.dll  [private]
+Program Files\URE\bin\acceptorlo.dll  [private]
+Program Files\URE\bin\binaryurplo.dll  [private]
+Program Files\URE\bin\bootstraplo.dll  [private]
+Program Files\URE\bin\connectorlo.dll  [private]
+Program Files\URE\bin\introspectionlo.dll  [private]
+Program Files\URE\bin\invocadaptlo.dll  [private]
+Program Files\URE\bin\invocationlo.dll  [private]
+Program Files\URE\bin\javaloaderlo.dll  [private]
+Program Files\URE\bin\javavmlo.dll  [private]
+Program Files\URE\bin\namingservicelo.dll  [private]
+Program Files\URE\bin\proxyfaclo.dll  [private]
+Program Files\URE\bin\reflectionlo.dll  [private]
+Program Files\URE\bin\streamslo.dll  [private]
+Program Files\URE\bin\textinstreamlo.dll  [private]
+Program Files\URE\bin\textoutstreamlo.dll  [private]
+Program Files\URE\bin\stocserviceslo.dll  [private]
+Program Files\URE\bin\uuresolverlo.dll  [private]
 Program Files\URE\bin\uwinapi.dll  [private]
 Program Files\URE\java\java_uno.jar  [private]
 Program Files\URE\misc\javavendors.xml  [private]