diff options
Diffstat (limited to 'xc/programs/Imakefile')
| -rw-r--r-- | xc/programs/Imakefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/xc/programs/Imakefile b/xc/programs/Imakefile index 1ff0a9558..6f07397af 100644 --- a/xc/programs/Imakefile +++ b/xc/programs/Imakefile @@ -2,7 +2,7 @@ XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:47:01 cpqbld Exp $ -XCOMM $XFree86: xc/programs/Imakefile,v 3.49 2001/11/02 23:29:28 dawes Exp $ +XCOMM $XFree86: xc/programs/Imakefile,v 3.52 2002/09/03 06:48:28 keithp Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" @@ -64,6 +64,10 @@ XFINDPROXYSRCDIR = xfindproxy MKCFMSRCDIR = mkcfm #endif +#if (HasFreetype2 || BuildFreetype2Library) && BuildFontEncLib + MKFONTSCALEDIR = mkfontscale +#endif + #if BuildXIElib XIECLIENTDIRS = xieperf #endif @@ -87,9 +91,6 @@ XTRAPCLIENTDIRS = xtrap #endif XPMCLIENTDIRS = cxpm sxpm -#if UseFreetype2 - XFTCACHEDIR = xftcache -#endif #if BuildGLXLibrary && BuildGLULibrary GLXCLIENTDIRS = glxinfo glxgears @@ -103,6 +104,10 @@ XTRAPCLIENTDIRS = xtrap XRANDRDIR = xrandr #endif +#if BuildXcursorgen + XCURSORGENDIR = xcursorgen +#endif + #if BuildServersOnly || !BuildClients SUBDIRS = $(XSSRCDIR) #else @@ -112,8 +117,8 @@ SUBDIRS = \ ico listres luit \ $(MAKEPSRESDIR) $(DPSCLIENTDIRS) \ $(MKCFMSRCDIR) \ - mkfontdir oclock $(PROXYMGRSRCDIR) $(RGBSRCDIR) $(RSTARTSRCDIR) \ - showfont \ + mkfontdir $(MKFONTSCALEDIR) oclock $(PROXYMGRSRCDIR) \ + $(RGBSRCDIR) $(RSTARTSRCDIR) showfont \ $(SMPROXYSRCDIR) $(TWMSRCDIR) viewres x11perf xauth xbiff xcalc \ xclipboard xclock \ xcmsdb $(XCONSOLESRCDIR) xditview $(XDMSRCDIR) xdpyinfo \ @@ -127,7 +132,7 @@ SUBDIRS = \ $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \ $(XPMCLIENTDIRS) $(XVINFOSRCDIR) \ $(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \ - $(GLXCLIENTDIRS) $(XFTCACHEDIR) $(XRANDRDIR) + $(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR) #endif MakeSubdirs($(SUBDIRS)) |