Module Name: src
Committed By: snj
Date: Tue Nov 22 10:34:57 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
Log Message:
follow upstream change from 2009: build xf86Init.c with the rest of the
common code.
remove not-reproducible-build-friendly goop that set a build date for
the the x server. the static date (which we've already been using) in
xf86Build.h does just fine, although all it really does is add one
useless line to the X log.
fix whitespace around OSVENDOR
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.35 -r1.36 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.30 -r1.31 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.12 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/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.19 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.20
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.19 Thu Aug 18 18:42:09 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Tue Nov 22 10:34:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.19 2016/08/18 18:42:09 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.20 2016/11/22 10:34:57 snj Exp $
.for _SL in \
mi \
@@ -40,7 +40,6 @@
hw/xfree86/dri2 \
hw/xfree86/dummy \
hw/xfree86/i2c \
- hw/xfree86/init \
hw/xfree86/int10 \
hw/xfree86/loader \
hw/xfree86/xorgos \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.35 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.36
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.35 Mon Sep 26 22:37:31 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Tue Nov 22 10:34:57 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2016/09/26 22:37:31 mrg Exp $
+# $NetBSD: Makefile,v 1.36 2016/11/22 10:34:57 snj Exp $
-SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
+SUBDIR= common ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
x86emu xf86config \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.13 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.13 Fri Aug 19 03:59:31 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Tue Nov 22 10:34:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/19 03:59:31 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/11/22 10:34:57 snj Exp $
.include <bsd.own.mk>
@@ -31,7 +31,6 @@ LDFLAGS+= -rdynamic
LDADD+= -Wl,--whole-archive
LDADD+= ${LDADD.dix}
-LDADD+= ${LDADD.hw/xfree86/init}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
@@ -121,7 +120,6 @@ DPADD+= \
${DPADD.hw/xfree86/dri2} \
${DPADD.hw/xfree86/dixmods/fb} \
${DPADD.hw/xfree86/fb} \
- ${DPADD.hw/xfree86/init} \
${DPADD.hw/xfree86/common} \
${DPADD.hw/xfree86/loader} \
${DPADD.hw/xfree86/xf86config} \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.30 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.31
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.30 Mon Nov 21 08:43:49 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Tue Nov 22 10:34:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/11/21 08:43:49 snj Exp $
+# $NetBSD: Makefile,v 1.31 2016/11/22 10:34:57 snj Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ SRCS.randr= xf86RandR.c
SRCS= xf86Configure.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c \
xf86Events.c xf86Globals.c xf86AutoConfig.c \
- xf86Option.c \
+ xf86Option.c xf86Init.c \
xf86VidMode.c xf86fbman.c xf86cmap.c \
xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
xf86Mode.c xorgHelper.c \
@@ -29,18 +29,6 @@ SRCS= xf86Configure.c xf86Bus.c xf86Conf
SRCS.bus+= xf86sbusBus.c
.endif
-# Rebuild xf86Build.h on every make
-#
-CLEANFILES+= xf86Build.h
-xf86Build.h: .PHONY
- ${_MKTARGET_CREATE}
- echo "#define BUILD_DATE `date +%Y%m%d`" > ${.TARGET}
-
-# We don't use DPSRCS+=xf86Build.h because we don't want the entire
-# library to be rebuilt each time
-#
-xf86Init.c xf86Init.o: xf86Build.h
-
CLEANFILES+= xf86DefModeSet.c
xf86DefModeSet.c:
${_MKTARGET_CREATE}
@@ -111,7 +99,9 @@ IDRIVERS= mouse keyboard acecad calcomp
CPPFLAGS.xf86Bus.c= -DBUILDERADDR='"xfre...@xfree86.org"'
CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
-DBUILDERADDR='"x...@xorg.org"' \
- -DOSVENDOR='" The NetBSD Foundation, Inc."'
+ -DOSVENDOR='"The NetBSD Foundation, Inc."' \
+ -DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"' \
+ -DDEFAULT_LIBRARY_PATH='"${X11USRLIBDIR}"'
CPPFLAGS.xf86Globals.c= -DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"'
CPPFLAGS.xf86Configure.c= -DXF86CONFIGFILE='"xorg.conf"'
CPPFLAGS.xf86Config.c= -DDRIVERS='"${DRIVERS}"' \
