From 70b77a0fc329e2e205a596a738c7307d354e7b1c Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 14 Apr 2015 09:24:55 +0200
Subject: library clean-up: Don't build and link libXfont.a anymore. Use
 system's libXfont shared library and link dynamically.

---
 nx-X11/lib/Imakefile | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

(limited to 'nx-X11/lib/Imakefile')

diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile
index 599ea643f..2c7f17472 100644
--- a/nx-X11/lib/Imakefile
+++ b/nx-X11/lib/Imakefile
@@ -106,22 +106,6 @@ RENDERLIBDIR = Xrender
 EXPATBUILDDIR = expat
 #endif
 
-#if BuildFreetype2Library
-FREETYPE2BUILDDIR = freetype2
-#endif
-
-#if BuildFontconfigLibrary
-FONTCONFIGBUILDDIR = fontconfig
-#endif
-
-#if BuildXftLibrary
-XFTLIBDIR = Xft
-#endif
-
-#if BuildXft1Library
-XFT1LIBDIR = Xft1
-#endif
-
 #if BuildRandRLibrary
 RANDRLIBDIR = Xrandr
 #endif
@@ -165,7 +149,7 @@ XF86EXTLIBS = $(XF86MISCLIBDIR) $(XF86VMLIBDIR) \
 LBXUTILDIR = lbxutil
 #endif
 
-#if (BuildLBX || GzipFontCompression) && !HasZlib
+#if BuildLBX && !HasZlib
 ZLIBDIR = zlib
 #endif
 
@@ -177,16 +161,6 @@ REGEXDIR = regex
 XALIBDIR = Xa
 #endif
 
-#if BuildFontCacheLib
-FONTCACHELIBDIR = Xfontcache
-#endif
-
-FONTSUBDIR = font
-
-#if BuildFontEncLib
-FONTENCSUBDIR = fontenc
-#endif
-
 #if BuildXauLib
 XAULIBDIR = Xau
 #endif
@@ -218,15 +192,13 @@ LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(X11LIBDIR) \
              $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \
              $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
              $(DPSLIBDIR) $(PSRESLIBDIR) $(DPSTKLIBDIR) $(XINERAMADIR) \
-             $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
-             $(FONTCONFIGBUILDDIR) $(XFT1LIBDIR) \
-	     $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
+             $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) \
+	     $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
 	     $(XRESLIBDIR) $(APPLELIBDIR) $(DMXLIBDIR) $(WINDOWSLIBDIR) \
 	     $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR) \
 	     $(XCURSORLIBDIR) $(COMPOSITELIBDIR)
 
-SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
-          $(FONTCACHELIBDIR)
+SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS)
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
-- 
cgit v1.2.3