Module Name: src
Committed By: mrg
Date: Mon Aug 15 21:58:40 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Log Message:
don't define HAVE_XORG_CONFIG_H or _HAVE_DIX_CONFIG_H here.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
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/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.10 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.11
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.10 Sun Aug 14 03:43:03 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Mon Aug 15 21:58:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.10 2016/08/14 03:43:03 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.11 2016/08/15 21:58:40 mrg Exp $
.include <bsd.own.mk> # for NETBSDSRCDIR and mk.conf processing
@@ -21,9 +21,6 @@ X_BYTE_ORDER=0
CPPFLAGS+= ${X11FLAGS.SERVER}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include \
- -DHAVE_XORG_CONFIG_H -D_HAVE_DIX_CONFIG_H
-
.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
CPPFLAGS+= -D__GLX_ALIGN64
.endif
