diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-27 13:58:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-27 14:03:36 +0200 |
| commit | 644c33a857c46d540202189228f519946dc33833 (patch) | |
| tree | f4c5b944dbec7d0a82738e1f3712648c65d10754 /Repository.mk | |
| parent | 0c7ca339993ed2029cfe327379941e554a040a7d (diff) | |
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 removes now-unused UNOLIBS_URE.
Change-Id: Ib95dd45f18de140a54e62d632dbf2239f83c232e
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Repository.mk b/Repository.mk index f69f10ff0f0f..8c627637e913 100644 --- a/Repository.mk +++ b/Repository.mk @@ -449,21 +449,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ $(if $(ENABLE_JAVA),java_uno) \ $(if $(ENABLE_JAVA),juh) \ $(if $(ENABLE_JAVA),juhx) \ - $(if $(ENABLE_JAVA),jvmaccess) \ - $(if $(ENABLE_JAVA),jvmfwk) \ log_uno \ - reg \ - sal_textenc \ - store \ - $(if $(ENABLE_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 \ @@ -473,14 +465,22 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,ure, \ invocation \ $(if $(ENABLE_JAVA),javaloader) \ $(if $(ENABLE_JAVA),javavm) \ + $(if $(ENABLE_JAVA),jvmaccess) \ + $(if $(ENABLE_JAVA),jvmfwk) \ namingservice \ proxyfac \ reflection \ + reg \ + sal_textenc \ stocservices \ + store \ streams \ + $(if $(ENABLE_JAVA),sunjavaplugin) \ textinstream \ textoutstream \ + unoidl \ uuresolver \ + xmlreader \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ |