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 /postprocess | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 4 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 2e16ad8aad7d..8c2963d0a50e 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -31,7 +31,7 @@ $(packimages_DIR)/%.zip : \ $(packimages_DIR)/sorted.lst \ $(packimages_DIR)/commandimagelist.ilst \ $(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \ - $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ $(call gb_Postprocess_get_target,AllResources) \ $(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) @@ -48,7 +48,7 @@ $(packimages_DIR)/%.zip : \ -l $(dir $(call gb_ResTarget_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \ - $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \ $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_FIREBIRD_SDBC),-l $(SRCDIR)/connectivity/source/drivers/firebird)) \ -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 08e2e6e9bde7..c05072e06759 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -333,7 +333,7 @@ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Dr postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu postprocess_DRIVERS += evoab endif -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 337575ad42f1..5374b101398a 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -139,7 +139,7 @@ $(eval $(call gb_Rdb_add_components,services,\ shell/source/win32/simplemail/smplmail \ shell/source/win32/syssh \ vcl/vcl.windows \ - $(if $(SOLAR_JAVA), \ + $(if $(ENABLE_JAVA), \ accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \ ) \ ) \ @@ -229,7 +229,7 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(ENABLE_TDEAB), \ connectivity/source/drivers/kab/tdeab1 \ ) \ - $(if $(SOLAR_JAVA), \ + $(if $(ENABLE_JAVA), \ xmerge/source/bridge/XMergeBridge \ scripting/java/ScriptFramework \ scripting/java/ScriptProviderForJava \ |