diff options
Diffstat (limited to 'xc/programs/Xserver/Xext/Imakefile')
| -rw-r--r-- | xc/programs/Xserver/Xext/Imakefile | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/xc/programs/Xserver/Xext/Imakefile b/xc/programs/Xserver/Xext/Imakefile index 99e21c8e4..5f6c0ef08 100644 --- a/xc/programs/Xserver/Xext/Imakefile +++ b/xc/programs/Xserver/Xext/Imakefile @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/63 1997/11/24 16:48:40 kaleb $ -XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.28 1999/08/14 10:49:25 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.32 2000/02/13 06:15:30 dawes Exp $ #include <Server.tmpl> @@ -42,6 +42,14 @@ XF86MISCSRCS = xf86misc.c XF86MISCOBJS = xf86misc.o #endif +#if BuildXF86BigfontExt +XF86BIGFSRCS = xf86bigfont.c +XF86BIGFOBJS = xf86bigfont.o +#if HasShm + SHM_DEFINES = -DHAS_SHM +#endif +#endif + #if BuildXF86DGA XF86DGASRCS = xf86dga.c xf86dga2.c XF86DGAOBJS = xf86dga.o xf86dga2.o @@ -82,30 +90,49 @@ XF86MISCOBJS = xf86misc.o DPMSOBJS = dpms.o #endif +#if BuildFontCache + FONTCACHESRCS = fontcache.c + FONTCACHEOBJS = fontcache.o +#if 0 + FONTCACHEINCLUDES = -I$(XF86SRC)/os-support +#endif +#endif + + SRCS = shape.c $(SHMSRCS) $(MULTIBUFSRC) \ mitmisc.c xtest.c xtest1di.c xtest1dd.c sleepuntil.c \ bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c $(VIDMODESRCS) \ - $(XF86MISCSRCS) $(XF86DGASRCS) $(SECURITYSRCS) \ + $(XF86MISCSRCS) $(XF86BIGFSRCS) $(XF86DGASRCS) $(SECURITYSRCS) \ $(APPGROUPSRCS) xprint.c $(CUPSRCS) $(PNRXSRCS) $(DPMSSRCS) \ - $(EVISRCS) $(XVSRCS) $(XANTISRCS) + $(EVISRCS) $(XVSRCS) $(XANTISRCS) $(FONTCACHESRCS) OBJS = shape.o $(SHMOBJS) $(MULTIBUFOBJ) \ mitmisc.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o \ bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o $(VIDMODEOBJS) \ - $(XF86MISCOBJS) $(XF86DGAOBJS) $(SECURITYOBJS) \ + $(XF86MISCOBJS) $(XF86BIGFOBJS) $(XF86DGAOBJS) $(SECURITYOBJS) \ $(APPGROUPOBJS) xprint.o $(CUPOBJS) $(PNRXOBJS) $(DPMSOBJS) \ - $(EVIOBJS) $(XVOBJS) $(XANTIOBJS) + $(EVIOBJS) $(XVOBJS) $(XANTIOBJS) $(FONTCACHEOBJS) SOBJS = $(SHMOBJS) $(APPGROUPOBJS) $(SECURITYOBJS) xprint.o \ - xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) + xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) \ + $(XF86BIGFOBJS) XF86INCLUDES = -I$(XF86COMSRC) INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - $(PNRXINCLUDES) $(XF86INCLUDES) -I$(FONTINCSRC) + $(PNRXINCLUDES) $(XF86INCLUDES) -I$(FONTINCSRC) \ + $(FONTCACHEINCLUDES) LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln NormalLibraryObjectRule() +/* + * A hack to work around an optimisation problem with the compiler on + * FreeBSD 4.0-current in late 1999/early 2000. + */ +#if BuildXF86VidModeExt && defined(FreeBSDGccOptBug) +SpecialCObjectRule(xf86vmode,NullParameter,-O0) +#endif + NormalLibraryTarget(ext,$(OBJS)) LintLibraryTarget(ext,$(SRCS)) NormalLintTarget($(SRCS)) @@ -114,11 +141,14 @@ NormalLintTarget($(SRCS)) NormalLibraryTarget(exts,$(SOBJS)) #endif +#if BuildXF86BigfontExt +SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES)) +#endif #if BuildXCSecurity SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF)) #endif -LinkVarDirectory(xserver,.,xserver,.) +LinkConfDirectory(xserver,.,xserver,.) #if BuildXCSecurity && InstallSecurityConfig InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) |