[src/trunk]: src/external/mit/xorg/server don't install dix-config.h. it sho...

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

details:   https://anonhg.NetBSD.org/src/rev/be5fe8612b42
branches:  trunk
changeset: 817412:be5fe8612b42
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Aug 19 22:33:34 2016 +0000

description:
don't install dix-config.h.  it shouldn't be.

diffstat:

 external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext                 |  4 ++--
 external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile        |  4 +++-
 external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile |  6 +++---
 external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile         |  6 +++---
 external/mit/xorg/server/xorg-server.old/include/Makefile                   |  4 ++--
 external/mit/xorg/server/xorg-server/include/Makefile                       |  4 ++--
 6 files changed, 15 insertions(+), 13 deletions(-)

diffs (112 lines):

diff -r 5cfd2ca1d5b8 -r be5fe8612b42 external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext
--- a/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext       Fri Aug 19 20:51:58 2016 +0000
+++ b/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext       Fri Aug 19 22:33:34 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xext,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+#      $NetBSD: Makefile.Xext,v 1.2 2016/08/19 22:33:34 mrg Exp $
 
 .PATH:         ${X11SRCDIR.xorg-server}/Xext
 
@@ -12,7 +12,7 @@
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/miext/sync
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/composite
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/damageext
-CPPFLAGS+=     -DHAVE_DIX_CONFIG_H
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
 
 COPTS.panoramiX.c+=            -Wno-error
 COPTS.panoramiXprocs.c+=       -Wno-error
diff -r 5cfd2ca1d5b8 -r be5fe8612b42 external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile      Fri Aug 19 20:51:58 2016 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile      Fri Aug 19 22:33:34 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2016/08/19 22:33:34 mrg Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -20,6 +20,8 @@
        ${X11FLAGS.EXTENSION} \
        -DHAVE_DIX_CONFIG_H \
        -DXFree86LOADER
+CPPFLAGS+= \
+       -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
 
 SUBDIR = \
        dbe \
diff -r 5cfd2ca1d5b8 -r be5fe8612b42 external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile       Fri Aug 19 20:51:58 2016 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile       Fri Aug 19 22:33:34 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/19 22:33:34 mrg Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
 
@@ -26,8 +26,8 @@
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${DESTDIR}${X11INCDIR}/xorg
 
-CPPFLAGS+=     ${X11FLAGS.DIX} ${X11INCS.DIX} \
-               -DHAVE_XORG_CONFIG_H
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
+CPPFLAGS+=     ${X11INCS.DIX} -DHAVE_XORG_CONFIG_H
 
 # XXX
 CPPFLAGS.xf86RandR12.c=        -Wno-error
diff -r 5cfd2ca1d5b8 -r be5fe8612b42 external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile       Fri Aug 19 20:51:58 2016 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile       Fri Aug 19 22:33:34 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2016/08/19 22:33:34 mrg Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -35,8 +35,8 @@
                -I${DESTDIR}${X11INCDIR}/xorg
 
 CPPFLAGS+=     ${X11FLAGS.OS_DEFINES} -DDLOPEN_SUPPORT -DHAS_SHM \
-               -DIN_LOADER \
-               ${x11FLAGS.DIX}
+               -DIN_LOADER
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
 
 .if ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=     -DUseMMAP
diff -r 5cfd2ca1d5b8 -r be5fe8612b42 external/mit/xorg/server/xorg-server.old/include/Makefile
--- a/external/mit/xorg/server/xorg-server.old/include/Makefile Fri Aug 19 20:51:58 2016 +0000
+++ b/external/mit/xorg/server/xorg-server.old/include/Makefile Fri Aug 19 22:33:34 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2016/08/19 22:33:34 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -54,7 +54,7 @@
        xkbstr.h xkbrules.h xserver-properties.h \
        dixaccess.h privates.h ptrveloc.h registry.h xkbfile.h \
        xf86xvmc.h xf86xvpriv.h xisb.h xorg-server.h xorgVersion.h xvdix.h \
-       xvmcext.h hotplug.h xkbsrv.h dix-config.h dri2.h rrtransform.h \
+       xvmcext.h hotplug.h xkbsrv.h dri2.h rrtransform.h \
        xsha1.h version-config.h
 
 .include <bsd.x11.mk>
diff -r 5cfd2ca1d5b8 -r be5fe8612b42 external/mit/xorg/server/xorg-server/include/Makefile
--- a/external/mit/xorg/server/xorg-server/include/Makefile     Fri Aug 19 20:51:58 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/include/Makefile     Fri Aug 19 22:33:34 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2016/08/18 18:42:09 mrg Exp $
+#      $NetBSD: Makefile,v 1.18 2016/08/19 22:33:34 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -62,7 +62,7 @@
        xkbstr.h xkbrules.h xserver-properties.h \
        dixaccess.h privates.h ptrveloc.h registry.h xkbfile.h \
        xf86xvmc.h xf86xvpriv.h xisb.h xorg-server.h xorgVersion.h xvdix.h \
-       xvmcext.h hotplug.h xkbsrv.h dix-config.h dri2.h rrtransform.h \
+       xvmcext.h hotplug.h xkbsrv.h dri2.h rrtransform.h \
        xsha1.h version-config.h
 
 .include <bsd.x11.mk>