diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-11 11:02:39 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-11 16:44:25 +0200 |
| commit | c9c963d3e6991d0dd73a95fc9734e38683d5be9c (patch) | |
| tree | a78274f956bcfa7a734a99ac72827d3f2d4b9788 /Repository.mk | |
| parent | 2b4d8ab67bb5747d05c556663ff3d8aa470c3274 (diff) | |
autoinstall ure private libraries
Change-Id: Ia390c4d4a9be4b5520fd82a573029ea242f9ffb9
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/Repository.mk b/Repository.mk index de3bbd508701..457efec281a9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -414,36 +414,33 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ endif -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ - affine_uno \ - cli_cppuhelper \ - cli_uno \ - gcc3_uno \ - getuid \ - java_uno \ - jpipe \ - juh \ - juhx \ - log_uno \ - sal_textenc \ - sunjavaplugin \ - sunpro5_uno \ - unoidl \ - unsafe_uno \ - urelibs \ - xmlreader \ +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \ + affine_uno \ + $(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,$(COMNAME)),msci,mscx),gcc3)_uno \ )) -ifeq ($(OS),WNT) - $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ - jpipx \ - msci_uno \ - mscx_uno \ + $(if $(filter MSC,$(COM)),cli_cppuhelper) \ + $(if $(filter MSC,$(COM)),cli_uno) \ + getuid \ + jpipe \ + $(if $(filter WNT,$(OS)),jpipx) \ )) -endif - $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ avmediagst \ avmediagst_0_10 \ @@ -552,7 +549,6 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ cppuhelper \ - jvmaccess \ purpenvhelper \ salhelper \ )) @@ -651,10 +647,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ - jvmfwk \ - reg \ sal \ - store \ )) $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ |