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 /cui/Library_cui.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 'cui/Library_cui.mk')
| -rw-r--r-- | cui/Library_cui.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 1966b7fc1f33..c5e8609cbec5 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -53,7 +53,8 @@ $(eval $(call gb_Library_use_libraries,cui,\ drawinglayer \ editeng \ i18nisolang1 \ - jvmfwk \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmfwk) \ lng \ sal \ salhelper \ @@ -159,7 +160,8 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optHeaderTabListbox \ cui/source/options/opthtml \ cui/source/options/optinet2 \ - cui/source/options/optjava \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + cui/source/options/optjava) \ cui/source/options/optjsearch \ cui/source/options/optlingu \ cui/source/options/optmemory \ |