Module Name: src
Committed By: tsutsui
Date: Wed Jul 22 21:25:03 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
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?
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7 Sat Jul 18 16:07:15 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Wed Jul 22 21:25:03 2020
@@ -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 @@ SRCS+= miinitext.c
.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}\"
