diff options
| author | Andres Gomez <agomez@igalia.com> | 2013-04-11 00:38:55 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-11 07:41:30 +0000 |
| commit | 1b96fbb97c8f0a70c493387984f3b301b4d5378c (patch) | |
| tree | d42056d7bdda2f6ef3e3e9bb1ca52f98dc528473 /vcl | |
| parent | fc02ae8f825b9325c3f3d6b690a1bffeb0520253 (diff) | |
vcl: conditionally link to jvmaccess
When SOLAR_JAVA (Java) is not there, vcl plugins
will not link against jvmaccess.
Change-Id: I13e1ae7d605965b3609c6dfdaa66faa976382e65
Reviewed-on: https://gerrit.libreoffice.org/3320
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 3 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 3 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gtk3.mk | 3 | ||||
| -rw-r--r-- | vcl/Library_vclplug_kde.mk | 3 | ||||
| -rw-r--r-- | vcl/Library_vclplug_kde4.mk | 3 | ||||
| -rw-r--r-- | vcl/Library_vclplug_svp.mk | 3 | ||||
| -rw-r--r-- | vcl/Library_vclplug_tde.mk | 3 |
7 files changed, 14 insertions, 7 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index f3c6d7df7e01..bea09dbaace5 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -37,7 +37,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ cppuhelper \ i18nlangtag \ i18nutil \ - jvmaccess \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 6607d1057cb1..8c4d80810b1e 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -50,7 +50,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ cppuhelper \ i18nlangtag \ i18nutil \ - jvmaccess \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index cd9b63a0994a..948e5282892f 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -60,7 +60,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ cppuhelper \ i18nlangtag \ i18nutil \ - jvmaccess \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 5e9c666a2943..1eedaa515516 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ cppuhelper \ i18nlangtag \ i18nutil \ - jvmaccess \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 93f68587282a..45e1042ed703 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -44,7 +44,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ cppuhelper \ i18nlangtag \ i18nutil \ - jvmaccess \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 7d40e5eb467f..32e88dd6b112 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ cppuhelper \ i18nlangtag \ i18nutil \ - jvmaccess \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index f2c992b5adab..2abfce081bb9 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ cppuhelper \ i18nlangtag \ i18nutil \ - jvmaccess \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess) \ cppu \ sal \ )) |