Kaydet (Commit) 1b96fbb9 authored tarafından Andres Gomez's avatar Andres Gomez Kaydeden (comit) Miklos Vajna

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/3320Reviewed-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
Tested-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
üst fc02ae8f
...@@ -37,7 +37,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ ...@@ -37,7 +37,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\
cppuhelper \ cppuhelper \
i18nlangtag \ i18nlangtag \
i18nutil \ i18nutil \
jvmaccess \ $(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \ cppu \
sal \ sal \
)) ))
......
...@@ -50,7 +50,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ ...@@ -50,7 +50,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
cppuhelper \ cppuhelper \
i18nlangtag \ i18nlangtag \
i18nutil \ i18nutil \
jvmaccess \ $(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \ cppu \
sal \ sal \
)) ))
......
...@@ -60,7 +60,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ ...@@ -60,7 +60,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
cppuhelper \ cppuhelper \
i18nlangtag \ i18nlangtag \
i18nutil \ i18nutil \
jvmaccess \ $(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \ cppu \
sal \ sal \
)) ))
......
...@@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ ...@@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
cppuhelper \ cppuhelper \
i18nlangtag \ i18nlangtag \
i18nutil \ i18nutil \
jvmaccess \ $(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \ cppu \
sal \ sal \
)) ))
......
...@@ -44,7 +44,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ ...@@ -44,7 +44,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
cppuhelper \ cppuhelper \
i18nlangtag \ i18nlangtag \
i18nutil \ i18nutil \
jvmaccess \ $(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \ cppu \
sal \ sal \
)) ))
......
...@@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ ...@@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\
cppuhelper \ cppuhelper \
i18nlangtag \ i18nlangtag \
i18nutil \ i18nutil \
jvmaccess \ $(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \ cppu \
sal \ sal \
)) ))
......
...@@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ ...@@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\
cppuhelper \ cppuhelper \
i18nlangtag \ i18nlangtag \
i18nutil \ i18nutil \
jvmaccess \ $(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \ cppu \
sal \ sal \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment