[src/netbsd-3]: src/x11/Xserver/afb Pull up revision 1.6 (requested by rtr in...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bf90f8e31ed4
branches:  netbsd-3
changeset: 576390:bf90f8e31ed4
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 02 16:10:08 2005 +0000

description:
Pull up revision 1.6 (requested by rtr in ticket #525):
build afbmodule.c when we build loadable xserver
XXX
do this in a way that will let static link of Xserver easier when the
rest of the framework supports it

diffstat:

 x11/Xserver/afb/Makefile |  52 ++++-------------------------------------------
 1 files changed, 5 insertions(+), 47 deletions(-)

diffs (63 lines):

diff -r 76b7ac20dbdb -r bf90f8e31ed4 x11/Xserver/afb/Makefile
--- a/x11/Xserver/afb/Makefile  Sat Jul 02 16:10:01 2005 +0000
+++ b/x11/Xserver/afb/Makefile  Sat Jul 02 16:10:08 2005 +0000
@@ -1,54 +1,12 @@
-#      $NetBSD: Makefile,v 1.4.8.1 2005/06/29 12:15:25 tron Exp $
 
-XMODULEDIR=    ${X11USRLIBDIR}/modules
 
 .include "../Makefile.serverlib"
-
-LIB=   afb
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/${LIB}
-
-SRCS=  afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c \
-       afbtileG.c afbseg.c afbbitblt.c afbbres.c afbbresd.c \
-       afbbstore.c afbclip.c afbcmap.c afbfillarc.c afbfillrct.c \
-       afbfillsp.c afbfont.c afbgc.c afbgetsp.c afbhrzvert.c \
-       afbimage.c afbimggblt.c afbline.c afbmisc.c afbpixmap.c \
-       afbply1rct.c afbplygblt.c afbpntarea.c afbpntwin.c \
-       afbpolypnt.c afbpushpxl.c afbscrinit.c afbsetsp.c afbtegblt.c \
-       afbwindow.c afbzerarc.c
+.include <bsd.x11.mk>
 
 .if defined(X11FLAGS.LOADABLE)
-SRCS+= afbmodule.c
+SRCS=          afbmodule.c
+CPPFLAGS+=     ${X11FLAGS.LOADABLE}
+XMODULEDIR=    ${X11USRLIBDIR}/modules
 .endif
 
-CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/${LIB} \
-               -I${X11SRCDIR.xc}/programs/Xserver/cfb \
-               -I${X11SRCDIR.xc}/programs/Xserver/mfb \
-               -I${X11SRCDIR.xc}/programs/Xserver/mi \
-               -I${X11SRCDIR.xc}/programs/Xserver/include \
-               -I${DESTDIR}${X11INCDIR}/X11 \
-               -I${X11SRCDIR.xc}/include/fonts \
-               -I${XSERVERINCDIR}
-
-CPPFLAGS+=     ${X11FLAGS.LOADER}
-
-BUILDSYMLINKS= afbblt.c afbbltC.c \
-               afbblt.c afbbltCI.c \
-               afbblt.c afbbltG.c \
-               afbblt.c afbbltO.c \
-               afbblt.c afbbltX.c \
-               afbline.c afbseg.c \
-               afbtile.c afbtileC.c \
-               afbtile.c afbtileG.c
-
-CPPFLAGS.afbbltC.c=    -DMROP=Mcopy
-CPPFLAGS.afbbltCI.c=   -DMROP=McopyInverted
-CPPFLAGS.afbbltG.c=    -DMROP=0
-CPPFLAGS.afbbltO.c=    -DMROP=Mor
-CPPFLAGS.afbbltX.c=    -DMROP=Mxor
-CPPFLAGS.afbseg.c=     -DPOLYSEGMENT
-CPPFLAGS.afbtileC.c=   -DMROP=Mcopy
-CPPFLAGS.afbtileG.c=   -DMROP=0
-
-.include <bsd.x11.mk>
-LIBDIR=        ${XMODULEDIR}
-.include <bsd.lib.mk>
+.include "Makefile.afb"