Module Name: src
Committed By: mrg
Date: Tue Aug 16 07:56:48 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils: Makefile
Makefile.utils
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci:
Makefile
Log Message:
remove obsolete things.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
cvs rdiff -u -r1.6 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile
cvs rdiff -u -r1.6 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile
cvs rdiff -u -r1.7 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/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/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.17 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.18
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.17 Sun Aug 14 03:43:03 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Tue Aug 16 07:56:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.17 2016/08/14 03:43:03 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.18 2016/08/16 07:56:47 mrg Exp $
.for _SL in \
mi \
@@ -30,15 +30,10 @@
hw/xfree86/common \
hw/xfree86/ddc \
hw/xfree86/dixmods \
- hw/xfree86/dixmods/dbe \
hw/xfree86/dixmods/fb \
- hw/xfree86/dixmods/freetype \
- hw/xfree86/dixmods/record \
hw/xfree86/dixmods/shadow \
- hw/xfree86/dixmods/type1 \
hw/xfree86/dixmods/wfb \
hw/xfree86/dixmods/xorgxkb \
- hw/xfree86/dixmods/xtrap \
hw/xfree86/doc \
hw/xfree86/dri \
hw/xfree86/dri2 \
@@ -48,16 +43,12 @@
hw/xfree86/int10 \
hw/xfree86/loader \
hw/xfree86/xorgos \
- hw/xfree86/rac \
hw/xfree86/ramdac \
- hw/xfree86/scanpci \
hw/xfree86/shadowfb \
hw/xfree86/utils \
hw/xfree86/vbe \
hw/xfree86/vgahw \
hw/xfree86/x86emu \
- hw/xfree86/xf8_16bpp \
- hw/xfree86/xf8_32bpp \
hw/xfree86/xf86config \
hw/xfree86/xf86modes
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.15 Mon Feb 21 04:42:17 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Tue Aug 16 07:56:47 2016
@@ -1,18 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2011/02/21 04:42:17 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2016/08/16 07:56:47 mrg Exp $
SUBDIR= cvt gtf
-#SUBDIR= cvt gtf xorgconfig
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-#SUBDIR+=ioport pcitweak scanpci
-.endif
-
-.if ${MACHINE} == "cats" || ${MACHINE} == "macppc" || \
- ${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
- ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
- ${MACHINE} == "prep" || ${MACHINE} == "bebox" || \
- ${MACHINE} == "ofppc"
-#SUBDIR+=pcitweak scanpci
-.endif
+#SUBDIR+= xorgconfig
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.6 Fri Jun 10 03:37:34 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils Tue Aug 16 07:56:47 2016
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile.utils,v 1.6 2016/06/10 03:37:34 mrg Exp $
+# $NetBSD: Makefile.utils,v 1.7 2016/08/16 07:56:47 mrg Exp $
.include <bsd.own.mk>
DUMMYOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/dummy && ${PRINTOBJDIR}
-SCANPCIOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/scanpci && ${PRINTOBJDIR}
XORGOSOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/xorgos && ${PRINTOBJDIR}
LIBDUMMY= ${DUMMYOBJDIR}/libdummy.a
LIBXORGOS= ${XORGOSOBJDIR}/libxorgos.a
-LIBSCANPCI= ${SCANPCIOBJDIR}/libscanpci.a
