[src/netbsd-3]: src/x11/Xserver Pull up revision 1.3 (requested by tron in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/0e663d59a7b7
branches:  netbsd-3
changeset: 576462:0e663d59a7b7
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Jul 03 17:05:20 2005 +0000

description:
Pull up revision 1.3 (requested by tron in ticket #544):
Install "afb" module again on systems which use an X11 server with
loadable modules and don't install the static "afb" library on systems
which use a static server. This fixes build problems introduced by
recent changes.

diffstat:

 x11/Xserver/Xserver/Xamiga/Makefile |  6 +++---
 x11/Xserver/afb/Makefile.afb        |  4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r c8ccbe49a1af -r 0e663d59a7b7 x11/Xserver/Xserver/Xamiga/Makefile
--- a/x11/Xserver/Xserver/Xamiga/Makefile       Sun Jul 03 11:34:54 2005 +0000
+++ b/x11/Xserver/Xserver/Xamiga/Makefile       Sun Jul 03 17:05:20 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2004/01/17 06:39:43 rtr Exp $
+#      $NetBSD: Makefile,v 1.2.8.1 2005/07/03 17:05:20 snj Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@
 
 .include "../Makefile.Xserver"
 
-LDADD= ${LDADD.dix} ${LDADD.hw/netbsd/amiga} ${LDADD.afb} -lXfont \
+LDADD= ${LDADD.dix} ${LDADD.hw/netbsd/amiga} ${LDADD.afb/afb} -lXfont \
        -lfreetype ${LDADD.os} ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.cfb24} \
        ${LDADD.cfb32} ${LDADD.mfb} ${LDADD.xkb} ${LDADD.mi} \
        ${LDADD.Xext/ext} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
@@ -19,7 +19,7 @@
        ${LDADD.dbe} ${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} \
        -lXau -lXdmcp -lz -lm
 
-DPADD= ${DPADD.dix} ${DPADD.hw/netbsd/amiga} ${DPADD.afb} ${LIBXFONT} \
+DPADD= ${DPADD.dix} ${DPADD.hw/netbsd/amiga} ${DPADD.afb/afb} ${LIBXFONT} \
        ${LIBFREETYPE} ${DPADD.os} ${DPADD.cfb} ${DPADD.cfb16} \
        ${DPADD.cfb24} ${DPADD.cfb32} ${DPADD.mfb} ${DPADD.xkb} \
        ${DPADD.mi} ${DPADD.Xext/ext} ${DPADD.xinput} ${DPADD.lbx} \
diff -r c8ccbe49a1af -r 0e663d59a7b7 x11/Xserver/afb/Makefile.afb
--- a/x11/Xserver/afb/Makefile.afb      Sun Jul 03 11:34:54 2005 +0000
+++ b/x11/Xserver/afb/Makefile.afb      Sun Jul 03 17:05:20 2005 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile.afb,v 1.2.2.2 2005/07/02 16:10:01 tron Exp $
+#      $NetBSD: Makefile.afb,v 1.2.2.3 2005/07/03 17:05:20 snj Exp $
+
+.include "../Makefile.serverlib"
 
 LIB=   afb