diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-19 00:41:12 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-19 10:29:04 +0300 |
| commit | 08452f1208a2ecbf7c6f15a96efeedbe5210ec83 (patch) | |
| tree | fb09bce47d74d368ae9449bf4a5dc9e33c1ac1a8 /svtools | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/AllLangResTarget_svt.mk | 2 | ||||
| -rw-r--r-- | svtools/Library_svt.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index 9a5e41f1bcdb..3e3b7fb7d747 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -46,7 +46,7 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\ svtools/source/dialogs/formats.src \ svtools/source/dialogs/so3res.src \ svtools/source/dialogs/wizardmachine.src \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ svtools/source/java/javaerror.src) \ svtools/source/misc/ehdl.src \ svtools/source/misc/imagemgr.src \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 18fea9bb68f1..e5d3f399d002 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,svt,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmfwk) \ salhelper \ sal \ @@ -159,7 +159,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/graphic/provider \ svtools/source/graphic/renderer \ svtools/source/graphic/transformer \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ svtools/source/java/javacontext \ svtools/source/java/javainteractionhandler) \ svtools/source/misc/acceleratorexecute \ |