aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/Imakefile
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-14 09:24:55 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-22 06:22:37 +0200
commit70b77a0fc329e2e205a596a738c7307d354e7b1c (patch)
tree2c37d81d17f33bf288c3a44adc11bc328ee8e697 /nx-X11/lib/Imakefile
parenta77ca871c6c1b0d6d866f95e4eb6e013f92e9627 (diff)
downloadnx-libs-70b77a0fc329e2e205a596a738c7307d354e7b1c.tar.gz
nx-libs-70b77a0fc329e2e205a596a738c7307d354e7b1c.tar.bz2
nx-libs-70b77a0fc329e2e205a596a738c7307d354e7b1c.zip
library clean-up: Don't build and link libXfont.a anymore. Use system's libXfont shared library and link dynamically.pr/libxfont-cleanup
Diffstat (limited to 'nx-X11/lib/Imakefile')
-rw-r--r--nx-X11/lib/Imakefile36
1 files changed, 4 insertions, 32 deletions
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))