vcl: move vcl/generic/fontmanager files to vcl/unx/generic/fontmanager

These source files as all specific to Unix environments (not, however,
OS X) and are not "generic" (i.e. used across all platforms).

Change-Id: I23650c86a7b74c2ac150b981e4be88eaea07e936
Reviewed-on: https://gerrit.libreoffice.org/21314Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

vcl/CustomTarget_afm_hash.mk

@@ -6,14 +6,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/generic/fontmanager))
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/generic/fontmanager))
 
-$(call gb_CustomTarget_get_target,vcl/generic/fontmanager) : \
-	$(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp
+$(call gb_CustomTarget_get_target,vcl/unx/generic/fontmanager) : \
+	$(call gb_CustomTarget_get_workdir,vcl/unx/generic/fontmanager)/afm_hash.hpp
 
-$(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp : \
-		$(SRCDIR)/vcl/generic/fontmanager/afm_keyword_list \
-		| $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/.dir
+$(call gb_CustomTarget_get_workdir,vcl/unx/generic/fontmanager)/afm_hash.hpp : \
+		$(SRCDIR)/vcl/unx/generic/fontmanager/afm_keyword_list \
+		| $(call gb_CustomTarget_get_workdir,vcl/unx/generic/fontmanager)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1)
 	$(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e 's/(char\*)0/(char\*)0, NOPE/g' | grep -v '^#line' > $@
 

vcl/Library_vcl.mk

@@ -35,7 +35,7 @@ endif
 
 $(eval $(call gb_Library_set_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
 
-$(eval $(call gb_Library_use_custom_headers,vcl,officecfg/registry vcl/generic/fontmanager))
+$(eval $(call gb_Library_use_custom_headers,vcl,officecfg/registry vcl/unx/generic/fontmanager))
 
 $(eval $(call gb_Library_set_include,vcl,\
     $$(INCLUDE) \
@@ -554,12 +554,6 @@ vcl_generic_code= \
     vcl/generic/print/genprnpsp \
     vcl/generic/print/prtsetup \
     vcl/generic/print/text_gfx \
-    vcl/generic/fontmanager/fontsubst \
-    vcl/generic/fontmanager/fontcache \
-    vcl/generic/fontmanager/fontconfig \
-    vcl/generic/fontmanager/fontmanager \
-    vcl/generic/fontmanager/helper \
-    vcl/generic/fontmanager/parseAFM \
 
 vcl_headless_code= \
     vcl/headless/svpbmp \
@@ -579,6 +573,12 @@ vcl_headless_freetype_code=\
     vcl/unx/generic/glyphs/gcach_layout \
     vcl/unx/generic/glyphs/glyphcache \
     vcl/unx/generic/glyphs/scrptrun \
+    vcl/unx/generic/fontmanager/fontsubst \
+    vcl/unx/generic/fontmanager/fontcache \
+    vcl/unx/generic/fontmanager/fontconfig \
+    vcl/unx/generic/fontmanager/fontmanager \
+    vcl/unx/generic/fontmanager/helper \
+    vcl/unx/generic/fontmanager/parseAFM \
     vcl/headless/svpcairotextrender \
 
 ifeq ($(USING_X11),TRUE)