Module Name: src
Committed By: mrg
Date: Sat Aug 20 01:03:34 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/Xext: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/mi: Makefile
Log Message:
delete dead code. fix DIX flags for xorg-server 1.18 build after the
no longer installed dix-config.h
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/mi/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/Xext/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.6 src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.6 Sun Aug 14 03:43:03 2016
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile Sat Aug 20 01:03:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/14 03:43:03 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/20 01:03:34 mrg Exp $
LIBISPRIVATE= yes
LIB= Xext
@@ -28,24 +28,8 @@ 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
-
-.if 0
-COPTS.panoramiX.c+= -Wno-error
-COPTS.panoramiXprocs.c+= -Wno-error
-COPTS.saver.c+= -Wno-error
-COPTS.security.c+= -Wno-error
-COPTS.shape.c+= -Wno-error
-COPTS.shm.c+= -Wno-error
-COPTS.sync.c+= -Wno-error
-COPTS.xf86bigfont.c+= -Wno-error
-COPTS.xres.c= -Wno-error
-COPTS.xvdisp.c+= -Wno-error
-COPTS.xvmain.c+= -Wno-error
-COPTS.xvmc.c+= -Wno-error
-COPTS.bigreq.c+= -Wno-error # XXX bigreqstr.h
-COPTS.xcmisc.c+= -Wno-error # XXX xcmiscstr.h
-.endif
+#CPPFLAGS+= -DHAVE_DIX_CONFIG_H
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
.PATH: ${X11SRCDIR.xorg-server}/Xext
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.12 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.12 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Sat Aug 20 01:03:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/20 01:03:34 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -19,8 +19,9 @@ CPPFLAGS+= \
CPPFLAGS+= \
${X11FLAGS.EXTENSION} \
- -DHAVE_DIX_CONFIG_H \
-DXFree86LOADER
+CPPFLAGS+= \
+ -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
SUBDIR = \
fb \
Index: src/external/mit/xorg/server/xorg-server/mi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/mi/Makefile:1.12 src/external/mit/xorg/server/xorg-server/mi/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/mi/Makefile:1.12 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/mi/Makefile Sat Aug 20 01:03:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/20 01:03:34 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -35,15 +35,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/..
CPPFLAGS.miscrinit.c= ${X11FLAGS.EXTENSION}
-.if 0
-.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "mac68k"
-SRCS+= miinitext.c
-CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION}
-CPPFLAGS.miinitext.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA
-CPPFLAGS.miscrinit.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA
-.endif
-.endif
-
COPTS.micmap.c+= -Wno-error
COPTS.miexpose.c+= -Wno-error
