[src/trunk]: src/x11/Xserver/Xserver sparc64:

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

details:   https://anonhg.NetBSD.org/src/rev/a682cc7b5601
branches:  trunk
changeset: 556637:a682cc7b5601
user:      rtr <rtr%NetBSD.org@localhost>
date:      Mon Dec 22 15:57:51 2003 +0000

description:
sparc64:
        link libxinput.a into xserver

diffstat:

 x11/Xserver/Xserver/Xsun/Makefile     |  19 +++++++++++++------
 x11/Xserver/Xserver/Xsun24/Makefile   |  13 ++++++++++---
 x11/Xserver/Xserver/XsunMono/Makefile |  13 ++++++++++---
 3 files changed, 33 insertions(+), 12 deletions(-)

diffs (97 lines):

diff -r 756cabc8438f -r a682cc7b5601 x11/Xserver/Xserver/Xsun/Makefile
--- a/x11/Xserver/Xserver/Xsun/Makefile Mon Dec 22 15:45:57 2003 +0000
+++ b/x11/Xserver/Xserver/Xsun/Makefile Mon Dec 22 15:57:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2003/12/20 01:38:00 rtr Exp $
+#      $NetBSD: Makefile,v 1.2 2003/12/22 15:57:51 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -14,12 +14,19 @@
 
 LDADD= ${LIBDIR.hw/sun}/sunInit.o ${LDADD.hw/sun} ${LDADD.dix} ${LDADD.os} \
        ${LDADD.cfb} ${LDADD.mfb} ${LDADD.dix/xpstubs} ${LDADD.mi} \
-       ${LDADD.Xext/ext} ${LDADD.xkb} ${LDADD.lbx} ${LDADD.lbxutil} \
-       ${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} ${LDADD.GL/glx} \
-       ${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} ${LDADD.Xfont} \
-       -lfreetype ${LDADD.dix/xpstubs} -lfreetype -lXau -lXdmcp -lz -lm
+       ${LDADD.Xext/ext} ${LDADD.xkb}
+
+.if ${MACHINE} == "sparc64"
+LDADD+=        ${LDADD.xinput}
+DPADD= ${DPADD.xinput}
+.endif
 
-DPADD= ${LIBDIR.hw/sun}/sunInit.o ${DPADD.hw/sun} ${DPADD.dix} ${DPADD.os} \
+LDADD+=        ${LDADD.lbx} ${LDADD.lbxutil} ${LDADD.dbe} ${LDADD.record} \
+       ${LDADD.xtrap} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} \
+       ${LDADD.render} ${LDADD.Xfont} -lfreetype ${LDADD.dix/xpstubs} \
+       -lfreetype -lXau -lXdmcp -lz -lm
+
+DPADD+=        ${LIBDIR.hw/sun}/sunInit.o ${DPADD.hw/sun} ${DPADD.dix} ${DPADD.os} \
        ${DPADD.cfb} ${DPADD.mfb} ${DPADD.mi} ${LIBXEXT} ${DPADD.xkb} \
        ${DPADD.lbx} ${DPADD.lbxutil} ${DPADD.dbe} ${DPADD.record} \
        ${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} \
diff -r 756cabc8438f -r a682cc7b5601 x11/Xserver/Xserver/Xsun24/Makefile
--- a/x11/Xserver/Xserver/Xsun24/Makefile       Mon Dec 22 15:45:57 2003 +0000
+++ b/x11/Xserver/Xserver/Xsun24/Makefile       Mon Dec 22 15:57:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2003/12/20 01:38:00 rtr Exp $
+#      $NetBSD: Makefile,v 1.2 2003/12/22 15:57:51 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -14,13 +14,20 @@
 LDADD=  ${LIBDIR.hw/sun}/sunInitMulti.o ${LDADD.hw/sun} ${LDADD.dix} \
        ${LDADD.os} ${LDADD.cfb16} ${LDADD.cfb24} ${LDADD.cfb32} \
        ${LDADD.cfb} ${LDADD.mfb} ${LDADD.dix/xpstubs} ${LDADD.mi} \
-       ${LDADD.Xext/ext} ${LDADD.xkb} ${LDADD.lbx} ${LDADD.lbxutil} \
+       ${LDADD.Xext/ext} ${LDADD.xkb}
+
+.if ${MACHINE} == "sparc64"
+LDADD+= ${LDADD.xinput}
+DPADD= ${DPADD.xinput}
+.endif
+
+LDADD+=        ${LDADD.lbx} ${LDADD.lbxutil} \
        ${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} ${LDADD.GL/glx} \
        ${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} \
        ${LDADD.Xfont} -lfreetype ${LDADD.dix/xpstubs} -lfreetype -lXau \
        -lXdmcp -lz -lm
 
-DPADD=  ${LIBDIR.hw/sun}/sunInitMulti.o ${DPADD.hw/sun} ${DPADD.dix} \
+DPADD+=        ${LIBDIR.hw/sun}/sunInitMulti.o ${DPADD.hw/sun} ${DPADD.dix} \
        ${DPADD.os} ${DPADD.cfb16} ${DPADD.cfb24} ${DPADD.cfb32} \
        ${DPADD.cfb} ${DPADD.mfb} ${DPADD.mi} ${LIBXEXT} ${DPADD.xkb} \
        ${DPADD.lbx} ${DPADD.lbxutil} ${DPADD.dbe} ${DPADD.record} \
diff -r 756cabc8438f -r a682cc7b5601 x11/Xserver/Xserver/XsunMono/Makefile
--- a/x11/Xserver/Xserver/XsunMono/Makefile     Mon Dec 22 15:45:57 2003 +0000
+++ b/x11/Xserver/Xserver/XsunMono/Makefile     Mon Dec 22 15:57:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2003/12/20 01:38:00 rtr Exp $
+#      $NetBSD: Makefile,v 1.2 2003/12/22 15:57:51 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -13,12 +13,19 @@
 
 LDADD= ${LIBDIR.hw/sun}/sunInitMono.o ${LIBDIR.hw/sun}/sunInExMono.o \
        ${LDADD.hw/sun} ${LDADD.dix} ${LDADD.os} ${LDADD.mfb} ${LDADD.mi} \
-       ${LDADD.Xext/ext} ${LDADD.xkb} ${LDADD.lbx} ${LDADD.lbxutil} \
+       ${LDADD.Xext/ext} ${LDADD.xkb}
+
+.if ${MACHINE} == "sparc64"
+LDADD+= ${LDADD.xinput}
+DPADD+=        ${DPADD.xinput}
+.endif
+
+LDADD+=        ${LDADD.lbx} ${LDADD.lbxutil} \
        ${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} ${LDADD.GL/glx} \
        ${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} ${LDADD.Xfont} \
        -lfreetype ${LDADD.dix/xpstubs} -lfreetype -lXau -lXdmcp -lz -lm
 
-DPADD= ${LIBDIR.hw/sun}/sunInitMono.o ${LIBDIR.hw/sun}/sunInExMono.o \
+DPADD+=        ${LIBDIR.hw/sun}/sunInitMono.o ${LIBDIR.hw/sun}/sunInExMono.o \
        ${DPADD.hw/sun} ${DPADD.dix} ${DPADD.os} ${DPADD.mfb} ${DPADD.mi} \
        ${LIBXEXT} ${DPADD.xkb} ${DPADD.lbx} ${DPADD.lbxutil} ${DPADD.dbe} \
        ${DPADD.record} ${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} \