Revert "Make font-based unit test depend on instdir fonts"

The following build:

 $ make clean && make gb_CppunitTest_sc_ucalc
 [...]
 $ cd sc
 $ make gb_CppunitTest_sc_ucalc

triggers:

sc/CppunitTest_sc_subsequent_filters_test.mk:133:
   *** Missing font filelist -> run make more_fonts extras.

This didn't help the general Win32 font build problem AFAIK. There
were additional patches to the way Windows loads the LO provided
fonts, so just revert this.

This reverts commit 368c996b24.

Change-Id: I841f96fe8312c47980c8e3be2e9d88242df5b28d
Reviewed-on: https://gerrit.libreoffice.org/84633
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Jan-Marek Glogowski
2019-12-16 12:58:35 +01:00
committed by Stephan Bergmann
parent bac7e3cf4f
commit 1fc85d03c4
48 changed files with 81 additions and 97 deletions
+13
View File
@@ -28,6 +28,19 @@ $(eval $(call gb_Module_add_targets,postprocess,\
))
endif
# For configurations that use fontconfig (cf. inclusion of
# vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add
# instdir/share/fonts/truetype/fc_local.conf when it shall
# contain content from at least one of external/more_fonts/fc_local.snippet
# (conditional on MORE_FONTS in BUILD_TYPE) and
# extras/source/truetype/symbol/fc_local.snippet (unconditional):
ifneq ($(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)),)
$(eval $(call gb_Module_add_targets,postprocess, \
CustomTarget_fontconfig \
Package_fontconfig \
))
endif
ifeq ($(OS),LINUX)
ifneq ($(PKGFORMAT),)
$(eval $(call gb_Module_add_check_targets,postprocess,\