vcl: move all glyph files from generic to unx

All the files in glyph are only used by Unix based systems, with the
exception of OS X. Therefore, it's not really "generic" as in "used
across all platforms" but is generic as in "used in all Unix-based
systems".

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

vcl/Library_vcl.mk

@@ -423,7 +423,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 # handle X11 platforms, which have additional files and possibly system graphite
 ifneq (,$(or $(USING_X11),$(ENABLE_HEADLESS)))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/generic/glyphs/graphite_serverfont \
+    vcl/unx/generic/glyphs/graphite_serverfont \
 ))
 endif
 
@@ -555,9 +555,6 @@ vcl_generic_code= \
     vcl/generic/print/prtsetup \
     vcl/generic/print/text_gfx \
     vcl/generic/fontmanager/fontsubst \
-    vcl/generic/glyphs/gcach_layout \
-    vcl/generic/glyphs/glyphcache \
-    vcl/generic/glyphs/scrptrun \
     vcl/generic/fontmanager/fontcache \
     vcl/generic/fontmanager/fontconfig \
     vcl/generic/fontmanager/fontmanager \
@@ -579,6 +576,9 @@ vcl_headless_freetype_code=\
     vcl/headless/svpglyphcache \
     vcl/unx/generic/gdi/cairotextrender \
     vcl/unx/generic/glyphs/freetype_glyphcache \
+    vcl/unx/generic/glyphs/gcach_layout \
+    vcl/unx/generic/glyphs/glyphcache \
+    vcl/unx/generic/glyphs/scrptrun \
     vcl/headless/svpcairotextrender \
 
 ifeq ($(USING_X11),TRUE)

vcl/generic/fontmanager/fontsubst.cxx

@@ -19,7 +19,7 @@
 
 #include "generic/geninst.h"
 #include "generic/genpspgraphics.h"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 
 #include "vcl/sysdata.hxx"
 #include "fontinstance.hxx"

vcl/generic/print/genpspgraphics.cxx

@@ -46,7 +46,7 @@
 #include "fontsubset.hxx"
 #include "generic/geninst.h"
 #include "generic/genpspgraphics.h"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include "generic/printergfx.hxx"
 #include "impfont.hxx"
 #include "langboost.hxx"

vcl/headless/svpglyphcache.cxx

@@ -25,7 +25,7 @@
 #include <tools/debug.hxx>
 
 #include "generic/geninst.h"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include "headless/svpgdi.hxx"
 
 namespace

vcl/inc/graphite_serverfont.hxx

@@ -26,7 +26,7 @@
 #ifndef _MSC_VER
 #include <graphite_layout.hxx>
 
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 
 class PhysicalFontFace;
 

vcl/inc/unx/freetype_glyphcache.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
 #define INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
 
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include "PhysicalFontFace.hxx"
 
 #include <config_graphite.h>

vcl/unx/generic/gdi/cairotextrender.cxx

@@ -28,7 +28,7 @@
 #include "generic/printergfx.hxx"
 #include "generic/genpspgraphics.h"
 #include "generic/geninst.h"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include "PhysicalFontFace.hxx"
 #include "impfont.hxx"
 

vcl/unx/generic/gdi/gcach_xpeer.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_UNX_GENERIC_GDI_GCACH_XPEER_HXX
 #define INCLUDED_VCL_UNX_GENERIC_GDI_GCACH_XPEER_HXX
 
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 
 class X11GlyphCache : public GlyphCache
 {

vcl/generic/glyphs/graphite_serverfont.cxx → vcl/unx/generic/glyphs/graphite_serverfont.cxx

@@ -24,7 +24,7 @@
 #include <sallayout.hxx>
 // Module
 #include "unx/freetype_glyphcache.hxx"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include <graphite_features.hxx>
 #include <graphite_serverfont.hxx>