Module Name: src
Committed By: szptvlfn
Date: Fri Nov 6 21:32:23 UTC 2015
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/drivers/xf86-input-elographics: Makefile
src/external/mit/xorg/server/xorg-server/composite: Makefile
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
remove redundant \
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r1.74 -r1.75 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/composite/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/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/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.32 src/external/mit/xorg/lib/pixman/Makefile:1.33
--- src/external/mit/xorg/lib/pixman/Makefile:1.32 Sat May 2 14:54:18 2015
+++ src/external/mit/xorg/lib/pixman/Makefile Fri Nov 6 21:32:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2015/05/02 14:54:18 macallan Exp $
+# $NetBSD: Makefile,v 1.33 2015/11/06 21:32:22 szptvlfn Exp $
NOLINT= 1 # defined
@@ -41,7 +41,7 @@ SRCS+= \
pixman-x86.c \
pixman-mips.c \
pixman-arm.c \
- pixman-ppc.c \
+ pixman-ppc.c
# XXX
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.74 src/external/mit/xorg/server/drivers/Makefile:1.75
--- src/external/mit/xorg/server/drivers/Makefile:1.74 Fri Nov 6 01:17:08 2015
+++ src/external/mit/xorg/server/drivers/Makefile Fri Nov 6 21:32:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2015/11/06 01:17:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.75 2015/11/06 21:32:22 szptvlfn Exp $
# xf86-input drivers
@@ -36,7 +36,7 @@ SUBDIR+= \
xf86-video-cirrus_laguna \
xf86-video-glint \
xf86-video-i128 \
- xf86-video-i740 \
+ xf86-video-i740
# needs porting for xorg-server 1.6
# xf86-video-imstt \
Index: src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile:1.1 Sat Nov 28 17:27:30 2009
+++ src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile Fri Nov 6 21:32:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/11/28 17:27:30 mbalmer Exp $
+# $NetBSD: Makefile,v 1.2 2015/11/06 21:32:22 szptvlfn Exp $
DRIVER= xf86-input-elographics
DRIVER_NAME= elographics_drv
@@ -7,7 +7,7 @@ SRCS= xf86Elo.c
MAN= elographics.4
CPPFLAGS+= -DHAVE_CONFIG_H \
- -I${X11SRCDIR.${DRIVER}}/../include \
+ -I${X11SRCDIR.${DRIVER}}/../include
COPTS.xf86Elo.c= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/xorg-server/composite/Makefile
diff -u src/external/mit/xorg/server/xorg-server/composite/Makefile:1.4 src/external/mit/xorg/server/xorg-server/composite/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/composite/Makefile:1.4 Sat Aug 22 02:40:26 2009
+++ src/external/mit/xorg/server/xorg-server/composite/Makefile Fri Nov 6 21:32:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/08/22 02:40:26 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2015/11/06 21:32:22 szptvlfn Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -20,7 +20,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${X11SRCDIR.xorg-server}/miext/damage \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${X11SRCDIR.xorg-server}/../include \
+ -I${X11SRCDIR.xorg-server}/../include
# XXX
COPTS.compwindow.c= -Wno-error
Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.1 Sat Mar 1 19:39:03 2014
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Fri Nov 6 21:32:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/03/01 19:39:03 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2015/11/06 21:32:22 szptvlfn Exp $
.include <bsd.own.mk>
@@ -36,7 +36,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${X11SRCDIR.xorg-server}/fb \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/render \
- -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
-UXF86DRI -UXF86BIGFONT
