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 /solenv/gbuild/extensions/pre_MergedLibsList.mk | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'solenv/gbuild/extensions/pre_MergedLibsList.mk')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 496a402fcaaf..2dea0b2f4aba 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -46,7 +46,7 @@ gb_EXTRAMERGEDLIBS := \ fwm \ graphicfilter \ guesslang \ - $(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \ + $(if $(ENABLE_JAVA),hsqldb) \ hyphen \ icd \ icg \ @@ -60,7 +60,7 @@ gb_EXTRAMERGEDLIBS := \ ira \ itg \ iti \ - $(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \ + $(if $(ENABLE_JAVA),jdbc) \ $(if $(filter-out ANDROID IOS,$(OS)),ldapbe2) \ lnth \ $(if $(filter-out ANDROID IOS,$(OS)),log) \ @@ -166,8 +166,8 @@ gb_URELIBS := \ cppu \ cppuhelper \ introspection \ - $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ - $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ + $(if $(ENABLE_JAVA),jvmaccess) \ + $(if $(ENABLE_JAVA),jvmfwk) \ reflection \ reg \ sal \ |