[src/trunk]: src/external/mit/xorg/server/drivers/xf86-video-nv always build ...

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

details:   https://anonhg.NetBSD.org/src/rev/a5325d46cd70
branches:  trunk
changeset: 818040:a5325d46cd70
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Sep 21 18:00:26 2016 +0000

description:
always build the XAA files as well.  they have functions used
by the EXA code and besides a minor fix, were already setup to
build with HAVE_XAA_H not defined.

this should really fix PR#51480.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-nv/Makefile |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 19fe32d4b701 -r a5325d46cd70 external/mit/xorg/server/drivers/xf86-video-nv/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-nv/Makefile   Wed Sep 21 16:47:35 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-nv/Makefile   Wed Sep 21 18:00:26 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2016/09/02 03:49:56 jakllsch Exp $
+#      $NetBSD: Makefile,v 1.12 2016/09/21 18:00:26 mrg Exp $
 
 DRIVER=                xf86-video-nv
 DRIVER_NAME=   nv_drv
@@ -11,6 +11,11 @@
 SRCS+=         g80_output.c g80_sor.c
 MAN=           nv.4
 
+# XAA files have generic functions as well
+#.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SRCS+=         nv_xaa.c riva_xaa.c g80_xaa.c
+#.endif
+
 .if ${MACHINE} == "macppc"
 CPPFLAGS+= -DAVOID_VGAHW
 .endif
@@ -30,7 +35,3 @@
 COPTS+=                ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
 
 .include "../Makefile.xf86-driver"
-
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SRCS+=         nv_xaa.c riva_xaa.c g80_xaa.c
-.endif