summaryrefslogtreecommitdiff
path: root/sw/CppunitTest_sw_odfimport.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-10-13 10:17:40 +0300
committerTor Lillqvist <tml@collabora.com>2013-10-13 10:23:54 +0300
commit2b0320da7b59d2d4c0c5dc5da8424458ce0d819d (patch)
tree46603e07d360251eff813d34782e53f851c94ff6 /sw/CppunitTest_sw_odfimport.mk
parentd7961b15572373a29cc0839858ae514db6238ccd (diff)
No vcl.unx component in the ENABLE_HEADLESS case
Such a build passes make but make check fails, though. No, I am not interested in --enable-headless. (I actually think it is a pointless idea.) I just for fun tried such a build, thinking a bit whether the LIBO_HEADLESS thing could be replaced by simply !HAVE_FEATURE_DESKTOP, i.e. setting the latter to zero for a --enable-headless build. But whatever. Change-Id: I156f956bd2430ba76934774c7d220a1b9f2019bf
Diffstat (limited to 'sw/CppunitTest_sw_odfimport.mk')
-rw-r--r--sw/CppunitTest_sw_odfimport.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index ecaf98bf5d83..ee565568b431 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -75,7 +75,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
unoxml/source/service/unoxml \
uui/util/uui \
$(if $(filter-out MACOSX WNT,$(OS)), \
- vcl/vcl.unx \
+ $(if $(filter-out TRUE,$(ENABLE_HEADLESS)), \
+ vcl/vcl.unx \
+ ) \
) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
xmloff/util/xo \