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/programs/Xserver/Xext/Imakefile        | 4 ++--
 nx-X11/programs/Xserver/Xext/extmod/Imakefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nx-X11/programs/Xserver/Xext')

diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile
index 6c2c060f8..f44edb172 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -111,7 +111,7 @@ XF86BIGFOBJS = xf86bigfont.o
 #if BuildXinerama
         PNRXSRCS = panoramiX.c panoramiXSwap.c panoramiXprocs.c
         PNRXOBJS = panoramiX.o panoramiXSwap.o panoramiXprocs.o
-    PNRXINCLUDES = -I$(FONTINCSRC) -I../mi -I../render
+    PNRXINCLUDES = -I../mi -I../render
 #endif
 #if BuildDPMS
         DPMSSRCS = dpms.c
@@ -162,7 +162,7 @@ NX_DEFINES = -DNXAGENT_SERVER
 XF86INCLUDES = -I$(XF86COMSRC)
 #endif
     INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-		$(PNRXINCLUDES) $(XF86INCLUDES) -I$(FONTINCSRC) \
+		$(PNRXINCLUDES) $(XF86INCLUDES) \
 		$(FONTCACHEINCLUDES) $(DMXINCLUDES)
     LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
diff --git a/nx-X11/programs/Xserver/Xext/extmod/Imakefile b/nx-X11/programs/Xserver/Xext/extmod/Imakefile
index 450a318b4..45f3f39d7 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/extmod/Imakefile
@@ -98,7 +98,7 @@ LinkSourceFile(cup.c,..)
 
 XF86INCLUDES = -I$(XF86COMSRC)
     INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-	       $(XF86INCLUDES) $(FONTCACHEINCLUDES) -I$(FONTINCSRC)
+	       $(XF86INCLUDES) $(FONTCACHEINCLUDES)
     LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln
 
 LinkSourceFile(shape.c,..)
-- 
cgit v1.2.3