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 + whitespace cleanups
details: https://anonhg.NetBSD.org/src/rev/813c199bd71f
branches: rtr-xorg-branch
changeset: 571255:813c199bd71f
user: rtr <rtr%NetBSD.org@localhost>
date: Sun Nov 21 10:01:25 2004 +0000
description:
+ whitespace cleanups
+ remove extra bsd.own.mk's
+ separate module and lib handling into Makefile.serverlib and Makefile.servermod
diffstat:
x11/Xserver/GL/GLcore/Makefile | 6 +++---
x11/Xserver/GL/glx/Makefile | 6 +++---
x11/Xserver/Makefile.serverlib | 17 ++++-------------
x11/Xserver/Makefile.servermod | 13 +++++++++++++
x11/Xserver/Xext/Makefile | 4 ++--
x11/Xserver/Xext/ext/Makefile | 7 +++++--
x11/Xserver/Xext/extmod/Makefile | 12 +++++++-----
x11/Xserver/Xext/exts/Makefile | 7 +++++--
x11/Xserver/Xfont/bitmap/Makefile | 3 ++-
x11/Xserver/Xfont/freetype/Makefile | 3 ++-
x11/Xserver/Xfont/speedo/Makefile | 3 ++-
x11/Xserver/Xfont/type1/Makefile | 3 ++-
x11/Xserver/Xfont/xtt/Makefile | 3 ++-
x11/Xserver/afb/Makefile | 6 +++---
x11/Xserver/cfb/Makefile | 8 +++-----
x11/Xserver/cfb16/Makefile | 8 +++-----
x11/Xserver/cfb24/Makefile | 8 +++-----
x11/Xserver/cfb32/Makefile | 7 +++----
x11/Xserver/composite/Makefile | 5 ++---
x11/Xserver/damage/Makefile | 5 ++---
x11/Xserver/dbe/Makefile | 7 +++----
x11/Xserver/dix/Makefile | 3 ++-
x11/Xserver/dix/xpstubs/Makefile | 5 ++---
x11/Xserver/fb/Makefile | 6 +++---
x11/Xserver/fontbase/Makefile | 6 ++----
x11/Xserver/hw/vfb/Makefile | 5 +++--
x11/Xserver/hw/xfree86/Makefile | 4 +---
x11/Xserver/hw/xfree86/Makefile.drivermod | 4 +++-
x11/Xserver/hw/xfree86/ddc/Makefile | 3 ++-
x11/Xserver/hw/xfree86/drivers/atimisc/Makefile.atimisc | 4 ++--
x11/Xserver/hw/xfree86/drm/Makefile | 5 ++---
x11/Xserver/hw/xfree86/dummy/Makefile | 4 ++--
x11/Xserver/hw/xfree86/i2c/Makefile | 6 ++++--
x11/Xserver/hw/xfree86/int10/Makefile | 3 ++-
x11/Xserver/hw/xfree86/loader/Makefile | 3 ++-
x11/Xserver/hw/xfree86/pcidata/Makefile | 3 ++-
x11/Xserver/hw/xfree86/rac/Makefile | 4 +++-
x11/Xserver/hw/xfree86/ramdac/Makefile | 8 +++++---
x11/Xserver/hw/xfree86/scanpci/Makefile | 3 ++-
x11/Xserver/hw/xfree86/shadowfb/Makefile | 3 ++-
x11/Xserver/hw/xfree86/vbe/Makefile | 3 ++-
x11/Xserver/hw/xfree86/vgahw/Makefile | 6 +++---
x11/Xserver/hw/xfree86/xaa/Makefile | 5 +++--
x11/Xserver/hw/xfree86/xf1bpp/Makefile | 4 +++-
x11/Xserver/hw/xfree86/xf24_32bpp/Makefile | 5 +++--
x11/Xserver/hw/xfree86/xf4bpp/Makefile | 5 +++--
x11/Xserver/hw/xfree86/xf86/Makefile | 3 ++-
x11/Xserver/hw/xfree86/xf86_os/Makefile | 3 ++-
x11/Xserver/hw/xfree86/xf8_16bpp/Makefile | 5 +++--
x11/Xserver/hw/xfree86/xf8_32bpp/Makefile | 5 +++--
x11/Xserver/hw/xfree86/xloader/Makefile | 5 +++--
x11/Xserver/hw/xnest/Makefile | 5 +++--
x11/Xserver/iplan2p2/Makefile | 3 ++-
x11/Xserver/iplan2p4/Makefile | 3 ++-
x11/Xserver/iplan2p4/Makefile.iplan | 6 ++----
x11/Xserver/iplan2p8/Makefile | 3 ++-
x11/Xserver/lbx/Makefile | 7 +++----
x11/Xserver/mfb/Makefile | 6 +++---
x11/Xserver/mi/Makefile | 7 +++----
x11/Xserver/miext/cw/Makefile | 6 +++---
x11/Xserver/miext/damage/Makefile | 6 +++---
x11/Xserver/miext/layer/Makefile | 6 +++---
x11/Xserver/miext/shadow/Makefile | 6 +++---
x11/Xserver/os/Makefile | 6 +++---
x11/Xserver/printer/Makefile | 6 ++----
x11/Xserver/printer/pcl-mono/Makefile | 7 +++----
x11/Xserver/printer/pcl/Makefile | 7 +++----
x11/Xserver/printer/ps/Makefile | 7 +++----
x11/Xserver/printer/raster/Makefile | 7 +++----
x11/Xserver/randr/Makefile | 5 +++--
x11/Xserver/record/Makefile | 6 +++---
x11/Xserver/render/Makefile | 5 +++--
x11/Xserver/xfixes/Makefile | 5 +++--
x11/Xserver/xinput/Makefile | 7 +++----
x11/Xserver/xkb/Makefile | 5 +++--
x11/Xserver/xtrap/Makefile | 6 +++---
76 files changed, 220 insertions(+), 195 deletions(-)
diffs (truncated from 1349 to 300 lines):
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/GL/GLcore/Makefile
--- a/x11/Xserver/GL/GLcore/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/GL/GLcore/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4.4.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.4.4.2 2004/11/21 10:01:25 rtr Exp $
-.include <bsd.own.mk>
+.include "../../Makefile.serverlib"
.if ${X11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -8,5 +8,5 @@
SRCS= GLcoremodule.c
.endif
-.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
.include "Makefile.GLcore"
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/GL/glx/Makefile
--- a/x11/Xserver/GL/glx/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/GL/glx/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3.4.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:25 rtr Exp $
-.include <bsd.own.mk>
+.include "../../Makefile.serverlib"
.if ${X11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -8,5 +8,5 @@
SRCS= glxmodule.c
.endif
-.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
.include "Makefile.glx"
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Makefile.serverlib
--- a/x11/Xserver/Makefile.serverlib Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Makefile.serverlib Sun Nov 21 10:01:25 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.serverlib,v 1.8.2.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile.serverlib,v 1.8.2.2 2004/11/21 10:01:25 rtr Exp $
NOLINT= 1
NOPROFILE= 1
+# if not mips use x11 dynamic loader (no need for pic libs)
.if ${MACHINE_ARCH} != "mipseb" && ${MACHINE_ARCH} != "mipsel"
NOPIC= 1
.endif
@@ -10,11 +11,6 @@
.include <bsd.own.mk> # for NETBSDSRCDIR
.include <bsd.endian.mk>
-.if !defined(XMODULEDIR) && !defined(XMODULE)
-libinstall::
-moduleinstall::
-.endif
-
.if ${TARGET_ENDIANNESS} == "1234"
X_BYTE_ORDER=X_LITTLE_ENDIAN
.elif ${TARGET_ENDIANNESS} == "4321"
@@ -23,7 +19,8 @@
X_BYTE_ORDER=0
.endif
-CPPFLAGS+= ${X11FLAGS.SERVER} -DX_BYTE_ORDER=${X_BYTE_ORDER} -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
+CPPFLAGS+= ${X11FLAGS.SERVER} -DX_BYTE_ORDER=${X_BYTE_ORDER} \
+ -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
.if !defined(XSERVERINCDIR)
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
@@ -32,15 +29,9 @@
# Architectures that can't use the XFree86 loader (such as MIPS) can use
# dlopen() to load modules.
-
-.if defined(XMODULEDIR)
-CPPFLAGS+= ${X11FLAGS.LOADABLE}
.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
SHLIB_MAJOR= 0
SHLIB_MINOR= 0
MKPICLIB= yes
MKSTATICLIB= no
.endif
-.else
-NOPIC= 1
-.endif
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Makefile.servermod
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/Makefile.servermod Sun Nov 21 10:01:25 2004 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile.servermod,v 1.1.2.1 2004/11/21 10:01:25 rtr Exp $
+
+# if these aren't defined the module being built is not installed
+# instead it is statically linked into the xserver
+.if !defined(XMODULEDIR) && !defined(XMODULE)
+libinstall::
+moduleinstall::
+.endif
+
+# x11 modules that are installed need the X11FLAGS.LOADABLE's defined
+.if defined(XMODULEDIR)
+CPPFLAGS+= ${X11FLAGS.LOADABLE}
+.endif
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Xext/Makefile
--- a/x11/Xserver/Xext/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Xext/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4.4.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.4.4.2 2004/11/21 10:01:26 rtr Exp $
-.include <bsd.own.mk>
+.include "../Makefile.serverlib"
SUBDIR= ext exts
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Xext/ext/Makefile
--- a/x11/Xserver/Xext/ext/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Xext/ext/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile,v 1.4.2.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.4.2.2 2004/11/21 10:01:26 rtr Exp $
+
+.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
LIB= ext
+
SRCS= EVI.c appgroup.c bigreq.c cup.c dpms.c fontcache.c mitmisc.c \
panoramiX.c panoramiXSwap.c panoramiXprocs.c sampleEVI.c \
saver.c security.c shape.c shm.c sleepuntil.c sync.c \
@@ -14,5 +18,4 @@
CONFIGFILES= SecurityPolicy
FILESDIR= ${X11ETCDIR}/xserver
-.include "../../Makefile.serverlib"
.include "../Makefile.ext"
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Xext/extmod/Makefile
--- a/x11/Xserver/Xext/extmod/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Xext/extmod/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.3.4.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:26 rtr Exp $
+
+XMODULEDIR= ${X11ROOTDIR}/lib/modules/extensions
+
+.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
LIB= extmod
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/Xext/extmod
SRCS= shape.c mitmisc.c bigreq.c sync.c saver.c xcmisc.c xf86vmode.c \
xf86misc.c xf86dga.c xf86dga2.c cup.c dpms.c EVI.c sampleEVI.c \
xvmain.c xvdisp.c xvmod.c xvmc.c xres.c modinit.c
CPPFLAGS+= -DEXTMODULE -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
-XMODULEDIR= ${X11ROOTDIR}/lib/modules/extensions
-
-.include "../../Makefile.serverlib"
.include "../Makefile.ext"
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/Xext/extmod
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Xext/exts/Makefile
--- a/x11/Xserver/Xext/exts/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Xext/exts/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2003/12/21 03:07:01 rtr Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2004/11/21 10:01:26 rtr Exp $
+
+.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
LIB= exts
+
SRCS= appgroup.c panoramiX.c panoramiXSwap.c panoramiXprocs.c \
security.c shm.c sleepuntil.c xf86bigfont.c xprint.c \
xtest.c xtest1dd.c xtest1di.c
-.include "../../Makefile.serverlib"
.include "../Makefile.ext"
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Xfont/bitmap/Makefile
--- a/x11/Xserver/Xfont/bitmap/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Xfont/bitmap/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3.4.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:26 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/fonts
.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
LIB= bitmap
.PATH: ${X11SRCDIR.xc}/lib/font/bitmap
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Xfont/freetype/Makefile
--- a/x11/Xserver/Xfont/freetype/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Xfont/freetype/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5.4.2 2004/11/21 00:20:22 rtr Exp $
+# $NetBSD: Makefile,v 1.5.4.3 2004/11/21 10:01:26 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/fonts
.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
LIB= freetype
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Xfont/speedo/Makefile
--- a/x11/Xserver/Xfont/speedo/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Xfont/speedo/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3.4.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:26 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/fonts
.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
LIB= speedo
.PATH: ${X11SRCDIR.xc}/lib/font/Speedo
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Xfont/type1/Makefile
--- a/x11/Xserver/Xfont/type1/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Xfont/type1/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3.4.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:26 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/fonts
.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
LIB= type1
.PATH: ${X11SRCDIR.xc}/lib/font/Type1
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/Xfont/xtt/Makefile
--- a/x11/Xserver/Xfont/xtt/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/Xfont/xtt/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4.4.1 2004/11/15 09:12:38 rtr Exp $
+# $NetBSD: Makefile,v 1.4.4.2 2004/11/21 10:01:26 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/fonts
.include "../../Makefile.serverlib"
+.include "../../Makefile.servermod"
LIB= xtt
.PATH: ${X11SRCDIR.xc}/extras/X-TrueType
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/afb/Makefile
--- a/x11/Xserver/afb/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/afb/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4.4.1 2004/11/15 09:12:39 rtr Exp $
+# $NetBSD: Makefile,v 1.4.4.2 2004/11/21 10:01:26 rtr Exp $
-.include <bsd.own.mk>
+.include "../Makefile.serverlib"
.if ${X11LOADABLE} != "no"
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
SRCS= afbmodule.c
.endif
-.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
.include "Makefile.afb"
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/cfb/Makefile
--- a/x11/Xserver/cfb/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/cfb/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.3.4.1 2004/11/15 09:12:39 rtr Exp $
+# $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:26 rtr Exp $
-NOLINT= 1 # cfb8bit.c
-
-.include <bsd.own.mk>
+.include "../Makefile.serverlib"
.if ${X11LOADABLE} != "no"
PIXELSIZE= 8
@@ -10,5 +8,5 @@
SRCS= cfbcmap.c cfbmodule.c
.endif
-.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
.include "Makefile.cfb"
diff -r 2a0a20e902e4 -r 813c199bd71f x11/Xserver/cfb16/Makefile
--- a/x11/Xserver/cfb16/Makefile Sun Nov 21 04:12:33 2004 +0000
+++ b/x11/Xserver/cfb16/Makefile Sun Nov 21 10:01:25 2004 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.2.4.1 2004/11/15 09:12:39 rtr Exp $
+# $NetBSD: Makefile,v 1.2.4.2 2004/11/21 10:01:26 rtr Exp $
Home |
Main Index |
Thread Index |
Old Index