diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-10-08 10:56:27 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-10-08 10:56:27 +0200 |
| commit | 8ac7152ca8b3b71c17ea55ec9e660804990ab86c (patch) | |
| tree | 4f93fcb4969c6a4a350bc8fa5fe611fb8c255d57 /xmerge | |
| parent | 7e9a597202568a812a6470939b0ad1a693685adc (diff) | |
Don't build jars when java is disabled
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/Module_xmerge.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk index b5ef2789da5e..3b8503c5536b 100644 --- a/xmerge/Module_xmerge.mk +++ b/xmerge/Module_xmerge.mk @@ -29,11 +29,13 @@ $(eval $(call gb_Module_Module,xmerge)) $(eval $(call gb_Module_add_targets,xmerge,\ - Jar_aportisdoc \ - Jar_htmlsoff \ - Jar_pexcel \ - Jar_pocketword \ - Jar_xmerge \ - Jar_XMergeBridge \ + $(if $(SOLAR_JAVA), \ + Jar_aportisdoc \ + Jar_htmlsoff \ + Jar_pexcel \ + Jar_pocketword \ + Jar_xmerge \ + Jar_XMergeBridge \ + ) \ Package_xmergesync \ )) |