mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: conditionally link to jvmaccess

Browse Source 
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>
This commit is contained in:
Andres Gomez
2013-04-11 00:38:55 +03:00
committed by Miklos Vajna
parent fc02ae8f82
commit 1b96fbb97c
7 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vcl/Library_vclplug_gen.mk
View File

@@ -37,7 +37,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\
cppuhelper \
i18nlangtag \
i18nutil \
jvmaccess \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \
sal \
))

3
vcl/Library_vclplug_gtk.mk
View File

@@ -50,7 +50,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
cppuhelper \
i18nlangtag \
i18nutil \
jvmaccess \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \
sal \
))

3
vcl/Library_vclplug_gtk3.mk
View File

@@ -60,7 +60,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
cppuhelper \
i18nlangtag \
i18nutil \
jvmaccess \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \
sal \
))

3
vcl/Library_vclplug_kde.mk
View File

@@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
cppuhelper \
i18nlangtag \
i18nutil \
jvmaccess \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \
sal \
))

3
vcl/Library_vclplug_kde4.mk
View File

@@ -44,7 +44,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
cppuhelper \
i18nlangtag \
i18nutil \
jvmaccess \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \
sal \
))

3
vcl/Library_vclplug_svp.mk
View File

@@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\
cppuhelper \
i18nlangtag \
i18nutil \
jvmaccess \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \
sal \
))

3
vcl/Library_vclplug_tde.mk
View File

@@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\
cppuhelper \
i18nlangtag \
i18nutil \
jvmaccess \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess) \
cppu \
sal \
))