Module Name: src
Committed By: tsutsui
Date: Thu Nov 5 16:06:41 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile
Log Message:
Cherry-pick Xorg version independent changes from xorg-server.
Reorganize CPPFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/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.old/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2 Sat Jul 18 15:24:31 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Thu Nov 5 16:06:41 2020
@@ -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 @@ 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}/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"
