diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-17 08:34:22 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-02-17 08:34:22 +0100 |
| commit | 096f2b849c08dc6890b548621b9a19dd78661e6a (patch) | |
| tree | bd1b1951882f28924706c3cc74481cd5534bd132 /Repository.mk | |
| parent | 00e26baaf5cca36a7e78036aa5694196ccbf7402 (diff) | |
| parent | 144390821535d03735819d229e5ec397972b2436 (diff) | |
merge feature/gbuild_java
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index 5adc79464a02..6462d3a2f567 100644 --- a/Repository.mk +++ b/Repository.mk @@ -114,6 +114,14 @@ $(eval $(call gb_Helper_register_executables,OOO,\ endif +ifneq ($(OS),MACOSX) + +$(eval $(call gb_Helper_register_executables,UREBIN,\ + javaldx \ +)) + +endif + ifeq ($(WITH_MOZILLA),YES) $(eval $(call gb_Helper_register_executables,OOO,\ pluginapp.bin \ @@ -315,10 +323,23 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ endif $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ + jpipe \ + juh \ + juhx \ + jvmfwk \ sal_textenc \ + sunjavaplugin \ xmlreader \ )) +ifeq ($(OS),WNT) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ + jpipx \ +)) + +endif + $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ affine_uno \ avmediagst \ @@ -394,12 +415,12 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \ comphelper \ i18nisolang1 \ i18nutil \ - jvmaccess \ ucbhelper \ )) $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ cppuhelper \ + jvmaccess \ purpenvhelper \ salhelper \ )) @@ -481,7 +502,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ - jvmfwk \ sal \ )) |