Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/rtr-xorg-branch]: src/x11/Xserver + minor static build corrections
details: https://anonhg.NetBSD.org/src/rev/032e8ec3028e
branches: rtr-xorg-branch
changeset: 571263:032e8ec3028e
user: rtr <rtr%NetBSD.org@localhost>
date: Tue Dec 07 11:00:32 2004 +0000
description:
+ minor static build corrections
+ rename X11LOADABLE -> MKX11LOADABLE for consistency
diffstat:
x11/Xserver/GL/GLcore/Makefile | 4 ++--
x11/Xserver/GL/glx/Makefile | 4 ++--
x11/Xserver/Makefile | 4 ++--
x11/Xserver/Xext/Makefile | 4 ++--
x11/Xserver/Xserver/XFree86/Makefile | 10 +++++-----
x11/Xserver/afb/Makefile | 4 ++--
x11/Xserver/cfb/Makefile | 6 +++---
x11/Xserver/cfb/Makefile.cfb | 4 ++--
x11/Xserver/cfb16/Makefile | 4 ++--
x11/Xserver/cfb24/Makefile | 4 ++--
x11/Xserver/cfb32/Makefile | 4 ++--
x11/Xserver/dbe/Makefile | 4 ++--
x11/Xserver/fb/Makefile | 4 ++--
x11/Xserver/hw/netbsd/macppc/Makefile | 3 ++-
x11/Xserver/hw/xfree86/Makefile | 4 ++--
x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile | 4 ++--
x11/Xserver/hw/xfree86/drivers/Makefile | 4 ++--
x11/Xserver/hw/xfree86/drivers/nv/Makefile.nv | 4 ++--
x11/Xserver/hw/xfree86/dummy/Makefile | 4 ++--
x11/Xserver/hw/xfree86/input/Makefile | 4 ++--
x11/Xserver/mfb/Makefile | 4 ++--
x11/Xserver/miext/cw/Makefile | 4 ++--
x11/Xserver/miext/damage/Makefile | 4 ++--
x11/Xserver/miext/layer/Makefile | 4 ++--
x11/Xserver/miext/shadow/Makefile | 4 ++--
x11/Xserver/record/Makefile | 4 ++--
x11/Xserver/xtrap/Makefile | 4 ++--
27 files changed, 58 insertions(+), 57 deletions(-)
diffs (truncated from 443 to 300 lines):
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/GL/GLcore/Makefile
--- a/x11/Xserver/GL/GLcore/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/GL/GLcore/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4.4.2 2004/11/21 10:01:25 rtr Exp $
+# $NetBSD: Makefile,v 1.4.4.3 2004/12/07 11:00:32 rtr Exp $
.include "../../Makefile.serverlib"
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/GLcore
SRCS= GLcoremodule.c
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/GL/glx/Makefile
--- a/x11/Xserver/GL/glx/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/GL/glx/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:25 rtr Exp $
+# $NetBSD: Makefile,v 1.3.4.3 2004/12/07 11:00:32 rtr Exp $
.include "../../Makefile.serverlib"
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL
SRCS= glxmodule.c
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/Makefile
--- a/x11/Xserver/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13.2.2 2004/11/21 11:57:47 rtr Exp $
+# $NetBSD: Makefile,v 1.13.2.3 2004/12/07 11:00:32 rtr Exp $
.include <bsd.own.mk>
.include "Makefile.common"
.if ${XSERVER_NEEDS_XFONT} != "no"
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
SUBDIR.xfont=Xfont
.endif
SUBDIR.xfont+=fontbase
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/Xext/Makefile
--- a/x11/Xserver/Xext/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/Xext/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4.4.3 2004/11/21 11:57:47 rtr Exp $
+# $NetBSD: Makefile,v 1.4.4.4 2004/12/07 11:00:32 rtr Exp $
.include "../Makefile.serverlib"
SUBDIR= ext exts
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
SUBDIR+= extmod
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/Xserver/XFree86/Makefile
--- a/x11/Xserver/Xserver/XFree86/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/Xserver/XFree86/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12.2.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.12.2.2 2004/12/07 11:00:32 rtr Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@
.include "../Makefile.Xserver"
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
LDADD= ${LIBDIR.xkb}/xf86KillSrv.o \
${LIBDIR.xkb}/xf86VT.o \
@@ -69,7 +69,7 @@
${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
${DPADD.mi} ${LIBZ} ${LIBM}
-.else # X11LOADABLE
+.else # MKX11LOADABLE
LDADD= ${LIBDIR.xkb}/xf86KillSrv.o \
@@ -128,7 +128,7 @@
${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
${DPADD.mi} ${LIBZ} ${LIBM}
-.endif # X11LOADABLE
+.endif # MKX11LOADABLE
.if ${MACHINE_ARCH} == "x86_64"
LDADD+= -lx86_64
@@ -143,7 +143,7 @@
.include <bsd.x11.mk>
.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb") \
- && ${X11LOADABLE} != "no"
+ && ${MKX11LOADABLE} != "no"
LDADD+= -larm
DPADD+= ${LIBARM}
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/afb/Makefile
--- a/x11/Xserver/afb/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/afb/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4.4.2 2004/11/21 10:01:26 rtr Exp $
+# $NetBSD: Makefile,v 1.4.4.3 2004/12/07 11:00:32 rtr Exp $
.include "../Makefile.serverlib"
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
SRCS= afbmodule.c
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/cfb/Makefile
--- a/x11/Xserver/cfb/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/cfb/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3.4.3 2004/11/21 11:57:47 rtr Exp $
+# $NetBSD: Makefile,v 1.3.4.4 2004/12/07 11:00:32 rtr Exp $
.include "../Makefile.serverlib"
PIXELSIZE= 8
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules
-SRCS= cfbcmap.c cfbmodule.c
+SRCS= cfbmodule.c
.endif
.include "../Makefile.servermod"
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/cfb/Makefile.cfb
--- a/x11/Xserver/cfb/Makefile.cfb Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/cfb/Makefile.cfb Tue Dec 07 11:00:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cfb,v 1.11.4.1 2004/11/15 09:12:39 rtr Exp $
+# $NetBSD: Makefile.cfb,v 1.11.4.2 2004/12/07 11:00:32 rtr Exp $
.if ${PIXELSIZE} == 8
LIB= cfb
@@ -19,7 +19,7 @@
cfbscrinit.c cfbseg.c cfbsetsp.c cfbsolidC.c \
cfbsolidG.c cfbsolidX.c cfbtegblt.c cfbtile32C.c \
cfbtile32G.c cfbtileoddC.c cfbtileoddG.c cfbwindow.c \
- cfbzerarcC.c cfbzerarcG.c cfbzerarcX.c
+ cfbzerarcC.c cfbzerarcG.c cfbzerarcX.c cfbcmap.c
X11XSERVERDIR= ${X11SRCDIR.xc}/programs/Xserver
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/cfb16/Makefile
--- a/x11/Xserver/cfb16/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/cfb16/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2.4.3 2004/11/21 11:57:47 rtr Exp $
+# $NetBSD: Makefile,v 1.2.4.4 2004/12/07 11:00:32 rtr Exp $
.include "../Makefile.serverlib"
PIXELSIZE= 16
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules
SRCS= cfbmodule16.c
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/cfb24/Makefile
--- a/x11/Xserver/cfb24/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/cfb24/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2.4.3 2004/11/21 11:57:47 rtr Exp $
+# $NetBSD: Makefile,v 1.2.4.4 2004/12/07 11:00:32 rtr Exp $
.include "../Makefile.serverlib"
PIXELSIZE= 24
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules
SRCS= cfbmodule24.c
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/cfb32/Makefile
--- a/x11/Xserver/cfb32/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/cfb32/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2.4.3 2004/11/21 11:57:47 rtr Exp $
+# $NetBSD: Makefile,v 1.2.4.4 2004/12/07 11:00:33 rtr Exp $
.include "../Makefile.serverlib"
PIXELSIZE= 32
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules
SRCS= cfbmodule32.c
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/dbe/Makefile
--- a/x11/Xserver/dbe/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/dbe/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:26 rtr Exp $
+# $NetBSD: Makefile,v 1.3.4.3 2004/12/07 11:00:33 rtr Exp $
.include "../Makefile.serverlib"
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
SRCS= dbemodule.c
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/fb/Makefile
--- a/x11/Xserver/fb/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/fb/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5.4.2 2004/11/21 10:01:26 rtr Exp $
+# $NetBSD: Makefile,v 1.5.4.3 2004/12/07 11:00:33 rtr Exp $
.include "../Makefile.serverlib"
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/hw/netbsd/macppc/Makefile
--- a/x11/Xserver/hw/netbsd/macppc/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/hw/netbsd/macppc/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:05 lukem Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2004/12/07 11:00:33 rtr Exp $
.include "../../../Makefile.serverlib"
+.include "../../../Makefile.servermod"
LIB= macppc
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/hw/xfree86/Makefile
--- a/x11/Xserver/hw/xfree86/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/hw/xfree86/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13.2.2 2004/11/21 10:01:26 rtr Exp $
+# $NetBSD: Makefile,v 1.13.2.3 2004/12/07 11:00:33 rtr Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
ramdac scanpci shadowfb vbe vgahw xaa xf1bpp xf24_32bpp \
xf4bpp xf86 xf86_os xf86config xf8_16bpp xf8_32bpp xloader
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
SUBDIR+=drivers input
.else
SUBDIR+=driver idriver
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile
--- a/x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.4.1 2004/11/15 09:12:39 rtr Exp $
+# $NetBSD: Makefile,v 1.4.4.2 2004/12/07 11:00:33 rtr Exp $
.include <bsd.own.mk>
@@ -87,7 +87,7 @@
# need to do this here, so that X11FLAGS.LOADABLE is available
.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb") \
- && ${X11LOADABLE} != "no"
+ && ${MKX11LOADABLE} != "no"
LDADD+= -larm
DPADD+= ${LIBARM}
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/hw/xfree86/drivers/Makefile
--- a/x11/Xserver/hw/xfree86/drivers/Makefile Mon Dec 06 19:34:02 2004 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/Makefile Tue Dec 07 11:00:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9.2.1 2004/11/15 09:12:39 rtr Exp $
+# $NetBSD: Makefile,v 1.9.2.2 2004/12/07 11:00:33 rtr Exp $
SUBDIR= ati atimisc chips fbdev glint imstt mga nv r128 radeon \
s3 s3virge savage sis tdfx trident vga wsfb
@@ -18,6 +18,6 @@
.include "../../../Makefile.serverlib"
-.if ${X11LOADABLE} != "no"
+.if ${MKX11LOADABLE} != "no"
.include <bsd.subdir.mk>
.endif
diff -r 65119cd59b28 -r 032e8ec3028e x11/Xserver/hw/xfree86/drivers/nv/Makefile.nv
--- a/x11/Xserver/hw/xfree86/drivers/nv/Makefile.nv Mon Dec 06 19:34:02 2004 +0000
Home |
Main Index |
Thread Index |
Old Index