diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-04 22:46:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-05 00:18:50 +0300 |
| commit | b7525f1f1d123084b60269f420300afdd405b0d1 (patch) | |
| tree | 0b2e32b3879a27802c0e607b187c1b43ab697c9e /svtools/Library_svt.mk | |
| parent | f5928f09ad53de2c4683000619d29be140a97be8 (diff) | |
Drop jvmaccess and jvmfwk when no SOLAR_JAVA
Just sprinkle #ifdef SOLAR_JAVA into the code instead.
In the source for jvmaccess and jvmfwk such ifdefs can be removed as
it isn't compiled unless SOLAR_JAVA.
Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606
Diffstat (limited to 'svtools/Library_svt.mk')
| -rw-r--r-- | svtools/Library_svt.mk | 8 |
1 files changed, 5 insertions, 3 deletions
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 \ |