[src/trunk]: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k Cher...

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

details:   https://anonhg.NetBSD.org/src/rev/c7c10eeafcc3
branches:  trunk
changeset: 945718:c7c10eeafcc3
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Nov 05 16:06:41 2020 +0000

description:
Cherry-pick Xorg version independent changes from xorg-server.

 Reorganize CPPFLAGS.

diffstat:

 external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile |  12 ++++-----
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (30 lines):

diff -r 3e114842702a -r c7c10eeafcc3 external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile  Thu Nov 05 15:04:51 2020 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile  Thu Nov 05 16:06:41 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2020/07/18 15:24:31 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.3 2020/11/05 16:06:41 tsutsui Exp $
 
 .include <bsd.own.mk>
 
@@ -31,16 +31,14 @@
 .PATH: ${X11SRCDIR.xorg-server}/fb
 SRCS+= fbcmap_mi.c
 
-CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/include \
-               -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
-               -I${X11SRCDIR.xorg-server}/fb \
-               -I${X11SRCDIR.xorg-server}/mi \
-               -I${X11SRCDIR.xorg-server}/render \
-               -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+               ${X11INCS.DIX}
 
 CPPFLAGS+=     -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
                -UXF86DRI -UXF86BIGFONT
 
+CPPFLAGS+=     -UHAVE_XORG_CONFIG_H
+
 CPPFLAGS.x68kConfig.c=  -DX11_LIBDIR=\"${X11ETCDIR}\"
 
 .include "../../../Makefile.Xserver"