diff options
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/AllLangResTarget_svt.mk | 3 | ||||
| -rw-r--r-- | svtools/Library_svt.mk | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index aff7ec4d078a..96cd1b450e82 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -54,7 +54,8 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\ svtools/source/dialogs/formats.src \ svtools/source/dialogs/so3res.src \ svtools/source/dialogs/wizardmachine.src \ - svtools/source/java/javaerror.src \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + svtools/source/java/javaerror.src) \ svtools/source/misc/ehdl.src \ svtools/source/misc/helpagent.src \ svtools/source/misc/imagemgr.src \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index fddc2993891d..4f6adaeb2f7f 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -45,7 +45,8 @@ $(eval $(call gb_Library_use_libraries,svt,\ cppuhelper \ i18nisolang1 \ i18nutil \ - jvmfwk \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmfwk) \ salhelper \ sal \ sot \ @@ -155,8 +156,9 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/graphic/provider \ svtools/source/graphic/renderer \ svtools/source/graphic/transformer \ - svtools/source/java/javacontext \ - svtools/source/java/javainteractionhandler \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + svtools/source/java/javacontext \ + svtools/source/java/javainteractionhandler) \ svtools/source/misc/acceleratorexecute \ svtools/source/misc/bindablecontrolhelper \ svtools/source/misc/cliplistener \ |