[src/rtr-xorg-branch]: src/x11/Xserver + fixor some static build goofs

[rtr <rtr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f2526e05c478
branches:  rtr-xorg-branch
changeset: 571256:f2526e05c478
user:      rtr <rtr%NetBSD.org@localhost>
date:      Sun Nov 21 11:57:47 2004 +0000

description:
+ fixor some static build goofs

diffstat:

 x11/Xserver/Makefile       |  9 ++++++---
 x11/Xserver/Xext/Makefile  |  4 ++--
 x11/Xserver/cfb/Makefile   |  5 +++--
 x11/Xserver/cfb16/Makefile |  5 +++--
 x11/Xserver/cfb24/Makefile |  5 +++--
 x11/Xserver/cfb32/Makefile |  5 +++--
 6 files changed, 20 insertions(+), 13 deletions(-)

diffs (102 lines):

diff -r 813c199bd71f -r f2526e05c478 x11/Xserver/Makefile
--- a/x11/Xserver/Makefile      Sun Nov 21 10:01:25 2004 +0000
+++ b/x11/Xserver/Makefile      Sun Nov 21 11:57:47 2004 +0000
@@ -1,11 +1,14 @@
-#      $NetBSD: Makefile,v 1.13.2.1 2004/11/15 09:12:38 rtr Exp $
+#      $NetBSD: Makefile,v 1.13.2.2 2004/11/21 11:57:47 rtr Exp $
 
 .include <bsd.own.mk>
 
 .include "Makefile.common"
 
-.if ${XSERVER_NEEDS_XFONT} != "no" && ${X11LOADABLE} != "no"
-SUBDIR.xfont=fontbase Xfont
+.if ${XSERVER_NEEDS_XFONT} != "no"
+.if ${X11LOADABLE} != "no"
+SUBDIR.xfont=Xfont
+.endif
+SUBDIR.xfont+=fontbase
 .else
 SUBDIR.xfont=
 .endif
diff -r 813c199bd71f -r f2526e05c478 x11/Xserver/Xext/Makefile
--- a/x11/Xserver/Xext/Makefile Sun Nov 21 10:01:25 2004 +0000
+++ b/x11/Xserver/Xext/Makefile Sun Nov 21 11:57:47 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4.4.2 2004/11/21 10:01:26 rtr Exp $
+#      $NetBSD: Makefile,v 1.4.4.3 2004/11/21 11:57:47 rtr Exp $
 
 .include "../Makefile.serverlib"
 
@@ -6,6 +6,6 @@
 
 .if ${X11LOADABLE} != "no"
 SUBDIR+=       extmod
-.include <bsd.subdir.mk>
 .endif
 
+.include <bsd.subdir.mk>
diff -r 813c199bd71f -r f2526e05c478 x11/Xserver/cfb/Makefile
--- a/x11/Xserver/cfb/Makefile  Sun Nov 21 10:01:25 2004 +0000
+++ b/x11/Xserver/cfb/Makefile  Sun Nov 21 11:57:47 2004 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:26 rtr Exp $
+#      $NetBSD: Makefile,v 1.3.4.3 2004/11/21 11:57:47 rtr Exp $
 
 .include "../Makefile.serverlib"
 
+PIXELSIZE=     8
+
 .if ${X11LOADABLE} != "no"
-PIXELSIZE=     8
 XMODULEDIR=    ${X11USRLIBDIR}/modules
 SRCS=          cfbcmap.c cfbmodule.c
 .endif
diff -r 813c199bd71f -r f2526e05c478 x11/Xserver/cfb16/Makefile
--- a/x11/Xserver/cfb16/Makefile        Sun Nov 21 10:01:25 2004 +0000
+++ b/x11/Xserver/cfb16/Makefile        Sun Nov 21 11:57:47 2004 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.2.4.2 2004/11/21 10:01:26 rtr Exp $
+#      $NetBSD: Makefile,v 1.2.4.3 2004/11/21 11:57:47 rtr Exp $
 
 .include "../Makefile.serverlib"
 
+PIXELSIZE=     16
+
 .if ${X11LOADABLE} != "no"
-PIXELSIZE=     16
 XMODULEDIR=    ${X11USRLIBDIR}/modules
 SRCS=          cfbmodule16.c
 .endif
diff -r 813c199bd71f -r f2526e05c478 x11/Xserver/cfb24/Makefile
--- a/x11/Xserver/cfb24/Makefile        Sun Nov 21 10:01:25 2004 +0000
+++ b/x11/Xserver/cfb24/Makefile        Sun Nov 21 11:57:47 2004 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.2.4.2 2004/11/21 10:01:26 rtr Exp $
+#      $NetBSD: Makefile,v 1.2.4.3 2004/11/21 11:57:47 rtr Exp $
 
 .include "../Makefile.serverlib"
 
+PIXELSIZE=     24
+
 .if ${X11LOADABLE} != "no"
-PIXELSIZE=     24
 XMODULEDIR=    ${X11USRLIBDIR}/modules
 SRCS=          cfbmodule24.c
 .endif
diff -r 813c199bd71f -r f2526e05c478 x11/Xserver/cfb32/Makefile
--- a/x11/Xserver/cfb32/Makefile        Sun Nov 21 10:01:25 2004 +0000
+++ b/x11/Xserver/cfb32/Makefile        Sun Nov 21 11:57:47 2004 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.2.4.2 2004/11/21 10:01:26 rtr Exp $
+#      $NetBSD: Makefile,v 1.2.4.3 2004/11/21 11:57:47 rtr Exp $
 
 .include "../Makefile.serverlib"
 
+PIXELSIZE=     32
+
 .if ${X11LOADABLE} != "no"
-PIXELSIZE=     32
 XMODULEDIR=    ${X11USRLIBDIR}/modules
 SRCS=          cfbmodule32.c
 .endif