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

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

details:   https://anonhg.NetBSD.org/src/rev/0e3d140cdf85
branches:  trunk
changeset: 936253:0e3d140cdf85
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Jul 22 21:25:03 2020 +0000

description:
Reorganize CPPFLAGS.

- use ${X11INCS.DIX} in <bsd.x11.mk>
- explicitly undef HAVE_XORG_CONFIG_H to avoid reference to
  hw/xfree86/common in mi/miinitext.c
- remove -DHAVE_DIX_CONFIG_H which is already defined in
  ${X11FLAGS.DIX} and pulled via Makefile.servermod

XXX: -DHAVE_STRCASECMP should also be moved to ${X11FLAGS.DIX},
     or should be pulled via include/dix-config.h?

diffstat:

 external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile |  15 +++--------
 1 files changed, 4 insertions(+), 11 deletions(-)

diffs (33 lines):

diff -r f6909857bca5 -r 0e3d140cdf85 external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Wed Jul 22 20:56:05 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Wed Jul 22 21:25:03 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.8 2020/07/22 21:25:03 tsutsui Exp $
 
 .include <bsd.own.mk>
 
@@ -28,20 +28,13 @@
 .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}/hw/xfree86/common \
-               -I${X11SRCDIR.xorg-server}/fb \
-               -I${X11SRCDIR.xorg-server}/mi \
-               -I${X11SRCDIR.xorg-server}/render \
-               -I${X11SRCDIR.xorg-server}/present \
-               -I${X11SRCDIR.xorg-server}/miext/damage \
-               -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+               ${X11INCS.DIX}
 
 CPPFLAGS+=     -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
                -UXF86DRI -UXF86BIGFONT
 
-CPPFLAGS+=     -DHAVE_DIX_CONFIG_H
+CPPFLAGS+=     -UHAVE_XORG_CONFIG_H
 CPPFLAGS+=     -DHAVE_STRCASECMP
 
 CPPFLAGS.x68kConfig.c=  -DX11_LIBDIR=\"${X11ETCDIR}\"