Module Name: src
Committed By: mrg
Date: Fri Aug 19 22:33:34 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/Xext: Makefile.Xext
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods:
Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod:
Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader:
Makefile
src/external/mit/xorg/server/xorg-server.old/include: Makefile
src/external/mit/xorg/server/xorg-server/include: Makefile
Log Message:
don't install dix-config.h. it shouldn't be.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/include/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/include/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/Xext/Makefile.Xext
diff -u src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext:1.2
--- src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext:1.1.1.1 Fri Jun 10 03:42:13 2016
+++ src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext Fri Aug 19 22:33:34 2016
@@ -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}/xf
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
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile Fri Aug 19 22:33:34 2016
@@ -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 @@ CPPFLAGS+= \
${X11FLAGS.EXTENSION} \
-DHAVE_DIX_CONFIG_H \
-DXFree86LOADER
+CPPFLAGS+= \
+ -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
SUBDIR = \
dbe \
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile Fri Aug 19 22:33:34 2016
@@ -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 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-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
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile Fri Aug 19 22:33:34 2016
@@ -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 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-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
Index: src/external/mit/xorg/server/xorg-server.old/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/include/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/include/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/include/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/include/Makefile Fri Aug 19 22:33:34 2016
@@ -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 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
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>
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.17 src/external/mit/xorg/server/xorg-server/include/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.17 Thu Aug 18 18:42:09 2016
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Fri Aug 19 22:33:34 2016
@@ -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 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
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>
