[src/netbsd-3]: src/x11/Xserver/hw/xfree86/drivers/sunffb Pull up revision 1....

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

details:   https://anonhg.NetBSD.org/src/rev/871b55b37524
branches:  netbsd-3
changeset: 575259:871b55b37524
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 22:21:57 2005 +0000

description:
Pull up revision 1.2 (requested by jmc in ticket #114):
Now that I found out the right conditionals, handle DRI for this driver.

diffstat:

 x11/Xserver/hw/xfree86/drivers/sunffb/Makefile |  19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r eb3c801ab935 -r 871b55b37524 x11/Xserver/hw/xfree86/drivers/sunffb/Makefile
--- a/x11/Xserver/hw/xfree86/drivers/sunffb/Makefile    Wed Apr 06 22:21:25 2005 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/sunffb/Makefile    Wed Apr 06 22:21:57 2005 +0000
@@ -1,13 +1,9 @@
-#      $NetBSD: Makefile,v 1.2.2.2 2005/04/06 21:42:07 tron Exp $
+#      $NetBSD: Makefile,v 1.2.2.3 2005/04/06 22:21:57 tron Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/drivers
 
 .include "../../../../Makefile.serverlib"
 
-.if 0
-DRISRCS = ffb_dri.c
-.endif 
-
 MODULE=        sunffb_drv
 MAN=   sunffb.4
 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/sunffb
@@ -16,7 +12,7 @@
        ffb_cplane.c ffb_fspans.c ffb_point.c ffb_seg.c ffb_plygon.c \
        ffb_line.c ffb_glyph.c ffb_frect.c ffb_circle.c ffb_checks.c \
        ffb_stubs.c ffb_gc.c ffb_gspans.c ffb_sspans.c ffb_zeroarc.c \
-       ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c ffb_dbe.c ${DRISRCS}
+       ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c ffb_dbe.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/sunffb \
                -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
@@ -36,6 +32,17 @@
                 -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${XSERVERINCDIR}
 
+
+.if ${X11DRI} != "no"
+SRCS+=         ffb_dri.c
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
+               -I${X11SRCDIR.xc}/lib/GL/dri \
+               -I${X11SRCDIR.xc}/include
+
+CPPFLAGS+=     ${X11FLAGS.DRI}
+.endif
+
 .include <bsd.x11.mk>
 LIBDIR=        ${XMODULEDIR}
 .include "../../Makefile.drivermod"