[src/trunk]: src/x11/Xserver/Xserver only pull in -li386 if ${MACHINE_ARCH} =...

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

details:   https://anonhg.NetBSD.org/src/rev/891b2c6eb8fa
branches:  trunk
changeset: 552690:891b2c6eb8fa
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Sep 30 09:45:29 2003 +0000

description:
only pull in -li386 if ${MACHINE_ARCH} == "i386".
(noticed during a cross-compile from i386 to alpha.  funny that ;-)

diffstat:

 x11/Xserver/Xserver/Xnest/Makefile |   9 +++++++--
 x11/Xserver/Xserver/Xprt/Makefile  |  11 ++++++++---
 x11/Xserver/Xserver/Xvfb/Makefile  |  11 ++++++++---
 3 files changed, 23 insertions(+), 8 deletions(-)

diffs (93 lines):

diff -r d8ac73694374 -r 891b2c6eb8fa x11/Xserver/Xserver/Xnest/Makefile
--- a/x11/Xserver/Xserver/Xnest/Makefile        Tue Sep 30 09:35:15 2003 +0000
+++ b/x11/Xserver/Xserver/Xnest/Makefile        Tue Sep 30 09:45:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:07 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 09:45:29 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -16,7 +16,7 @@
        ${LDADD.hw/xnest} ${LDADD.Xext/ext} ${LDADD.dbe} ${LDADD.record} \
        ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} ${LIBCWRAPPER} \
        -lXfont -lfreetype ${LDADD.dix/xpstubs} \
-       -lXext -lX11 -lz -lm -li386
+       -lXext -lX11 -lz -lm
 
 DPADD+=        ${DPADD.dix} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} ${DPADD.hw/xnest} \
        ${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
@@ -28,5 +28,10 @@
        ${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
        ${LIBXEXT} ${LIBX11} ${LIBZ} ${LIBM} ${LIBI386}
 
+.if ${MACHINE_ARCH} == "i386"
+LDADD+=        -li386
+DPADD+=        ${LIBI386}
+.endif
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r d8ac73694374 -r 891b2c6eb8fa x11/Xserver/Xserver/Xprt/Makefile
--- a/x11/Xserver/Xserver/Xprt/Makefile Tue Sep 30 09:35:15 2003 +0000
+++ b/x11/Xserver/Xserver/Xprt/Makefile Tue Sep 30 09:45:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:08 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 09:45:29 lukem Exp $
 
 NOMAN=         1
 
@@ -19,7 +19,7 @@
        ${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} \
        ${LIBCWRAPPER} \
        -lXfont -lfreetype ${LDADD.dix/xpstubs} \
-       -lz -lm -li386
+       -lz -lm
 
 DPADD+=        ${LIBDIR.printer}/ddxInit.o ${LIBDIR.printer}/miinitext.o \
        ${LIBDIR.printer}/dpmsstubs.o \
@@ -32,7 +32,12 @@
        ${DPADD.record} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.xtrap} \
        ${LIBCWRAPPER} \
        ${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
-       ${LIBZ} ${LIBM} ${LIBI386}
+       ${LIBZ} ${LIBM}
+
+.if ${MACHINE_ARCH} == "i386"
+LDADD+=        -li386
+DPADD+=        ${LIBI386}
+.endif
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r d8ac73694374 -r 891b2c6eb8fa x11/Xserver/Xserver/Xvfb/Makefile
--- a/x11/Xserver/Xserver/Xvfb/Makefile Tue Sep 30 09:35:15 2003 +0000
+++ b/x11/Xserver/Xserver/Xvfb/Makefile Tue Sep 30 09:45:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:08 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 09:45:29 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -15,7 +15,7 @@
        ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} \
        ${LIBCWRAPPER} \
        -lXfont -lfreetype ${LDADD.dix/xpstubs} \
-       -lz -lm -li386
+       -lz -lm
 
 DPADD+=        ${DPADD.dix} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} \
        ${DPADD.hw/vfb} ${DPADD.fb} ${DPADD.mfb} ${DPADD.dix/xpstubs} \
@@ -25,7 +25,12 @@
        ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.xtrap} \
        ${LIBCWRAPPER} \
        ${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
-       ${LIBZ} ${LIBM} ${LIBI386}
+       ${LIBZ} ${LIBM}
+
+.if ${MACHINE_ARCH} == "i386"
+LDADD+=        -li386
+DPADD+=        ${LIBI386}
+.endif
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>