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 /testtools | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/CustomTarget_bridgetest.mk | 2 | ||||
| -rw-r--r-- | testtools/Module_testtools.mk | 2 | ||||
| -rw-r--r-- | testtools/Rdb_uno_services.mk | 2 | ||||
| -rw-r--r-- | testtools/com/sun/star/comp/bridge/makefile.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index d461850ede46..e51601bc851f 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -20,7 +20,7 @@ endif $(call gb_CustomTarget_get_target,testtools/bridgetest) : \ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) \ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) \ - $(if $(SOLAR_JAVA),\ + $(if $(ENABLE_JAVA),\ $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) \ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX)) diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk index 65583e3e23c8..020040578e89 100644 --- a/testtools/Module_testtools.mk +++ b/testtools/Module_testtools.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,testtools,\ Rdb_uno_services \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,testtools,\ Jar_testComponent \ CustomTarget_bridgetest_javamaker \ diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk index ec85cb9facf0..b2ff7d9c73a7 100644 --- a/testtools/Rdb_uno_services.mk +++ b/testtools/Rdb_uno_services.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Rdb_add_components,uno_services,\ testtools/source/bridgetest/bridgetest \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Rdb_add_components,uno_services,\ testtools/source/bridgetest/testComponent \ )) diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk index 7e6480c5c8ab..2d872ea57d8c 100644 --- a/testtools/com/sun/star/comp/bridge/makefile.mk +++ b/testtools/com/sun/star/comp/bridge/makefile.mk @@ -27,7 +27,7 @@ TARGET=com_sun_star_comp_bridge # ------------------------------------------------------------------ -.IF "$(SOLAR_JAVA)" != "" +.IF "$(ENABLE_JAVA)" != "" JARFILES = ridl.jar jurt.jar juh.jar |