[src/trunk]: src/x11/Xserver/Xserver Don't rely on libs built from Xserver an...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/x11/Xserver/Xserver Don't rely on libs built from Xserver an...
From: rtr <rtr%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 14:12:26 +0000

details:   https://anonhg.NetBSD.org/src/rev/db4088367a6d
branches:  trunk
changeset: 556670:db4088367a6d
user:      rtr <rtr%NetBSD.org@localhost>
date:      Tue Dec 23 10:23:07 2003 +0000

description:
Don't rely on libs built from Xserver anymore, they're going away, instead
link to those installed (and were built from x11/lib)
Makefile.Xserver - don't create vars for dirs that soon won't exist.

diffstat:

 x11/Xserver/Xserver/Makefile.Xserver  |   4 ++--
 x11/Xserver/Xserver/XFree86/Makefile  |  10 +++++++++-
 x11/Xserver/Xserver/Xsun/Makefile     |   8 ++++----
 x11/Xserver/Xserver/Xsun24/Makefile   |  13 ++++++-------
 x11/Xserver/Xserver/XsunMono/Makefile |  11 +++++------
 5 files changed, 26 insertions(+), 20 deletions(-)

diffs (129 lines):

diff -r c5b396965e81 -r db4088367a6d x11/Xserver/Xserver/Makefile.Xserver
--- a/x11/Xserver/Xserver/Makefile.Xserver      Tue Dec 23 10:20:57 2003 +0000
+++ b/x11/Xserver/Xserver/Makefile.Xserver      Tue Dec 23 10:23:07 2003 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile.Xserver,v 1.6 2003/12/23 03:36:01 rtr Exp $
+#      $NetBSD: Makefile.Xserver,v 1.7 2003/12/23 10:23:07 rtr Exp $
 
 .PATH:         ${NETBSDSRCDIR}/x11/Xserver/Xserver
 
 .for _SL in    dix os mi printer printer/pcl printer/ps printer/raster \
                Xext/ext Xext/exts GL/glx GL/GLcore xkb xinput lbx dbe \
                record randr render xtrap mfb cfb cfb16 cfb24 cfb32 fb \
-               hw/xnest hw/vfb Xfont lbxutil fontbase \
+               hw/xnest hw/vfb fontbase \
                \
                dix/xpstubs hw/sun hw/xfree86/xf86 hw/xfree86/xf86_os \
                hw/xfree86/xf86config hw/xfree86/loader 
diff -r c5b396965e81 -r db4088367a6d x11/Xserver/Xserver/XFree86/Makefile
--- a/x11/Xserver/Xserver/XFree86/Makefile      Tue Dec 23 10:20:57 2003 +0000
+++ b/x11/Xserver/Xserver/XFree86/Makefile      Tue Dec 23 10:23:07 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/12/23 03:33:41 rtr Exp $
+#      $NetBSD: Makefile,v 1.4 2003/12/23 10:23:07 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -29,8 +29,16 @@
        ${LDADD.randr} ${LDADD.render} ${LDADD.hw/xfree86/xf86_os} \
        -lz -lm
 
+DPADD= ${DPADD.hw/xfree86/xf86} ${DPADD.hw/xfree86/xf86config} \
+       ${DPADD.hw/xfree86/xf86_os} ${DPADD.hw/xfree86/loader} \
+       ${DPADD.dix} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} ${DPADD.fontbase} \
+       ${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
+       ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
+       ${DPADD.mi} ${LIBZ} ${LIBM}
+
 .if ${MACHINE} == "i386"
 LDADD+=        -li386
+DPADD+=        ${LIBI386}
 .endif
 
 .include <bsd.x11.mk>
diff -r c5b396965e81 -r db4088367a6d x11/Xserver/Xserver/Xsun/Makefile
--- a/x11/Xserver/Xserver/Xsun/Makefile Tue Dec 23 10:20:57 2003 +0000
+++ b/x11/Xserver/Xserver/Xsun/Makefile Tue Dec 23 10:23:07 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/12/22 15:57:51 rtr Exp $
+#      $NetBSD: Makefile,v 1.3 2003/12/23 10:23:07 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -21,14 +21,14 @@
 DPADD= ${DPADD.xinput}
 .endif
 
-LDADD+=        ${LDADD.lbx} ${LDADD.lbxutil} ${LDADD.dbe} ${LDADD.record} \
+LDADD+=        ${LDADD.lbx} -llbxutil ${LDADD.dbe} ${LDADD.record} \
        ${LDADD.xtrap} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} \
-       ${LDADD.render} ${LDADD.Xfont} -lfreetype ${LDADD.dix/xpstubs} \
+       ${LDADD.render} -lXfont -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.lbx} ${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} \
        ${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} \
        ${DPADD.render} ${LIBXFONT} ${LDADD.dix/xpstubs} ${LIBFREETYPE} \
        ${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
diff -r c5b396965e81 -r db4088367a6d x11/Xserver/Xserver/Xsun24/Makefile
--- a/x11/Xserver/Xserver/Xsun24/Makefile       Tue Dec 23 10:20:57 2003 +0000
+++ b/x11/Xserver/Xserver/Xsun24/Makefile       Tue Dec 23 10:23:07 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/12/22 15:57:51 rtr Exp $
+#      $NetBSD: Makefile,v 1.3 2003/12/23 10:23:07 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -21,16 +21,15 @@
 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
+LDADD+=        ${LDADD.lbx} -llbxutil ${LDADD.dbe} ${LDADD.record} \
+       ${LDADD.xtrap} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} \
+       ${LDADD.render} -lXfont -lfreetype ${LDADD.dix/xpstubs} -lfreetype \
+       -lXau -lXdmcp -lz -lm
 
 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} \
+       ${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} \
        ${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} \
        ${DPADD.render} ${LIBXFONT} ${DPADD.dix/xpstubs} ${LIBFREETYPE} \
        ${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
diff -r c5b396965e81 -r db4088367a6d x11/Xserver/Xserver/XsunMono/Makefile
--- a/x11/Xserver/Xserver/XsunMono/Makefile     Tue Dec 23 10:20:57 2003 +0000
+++ b/x11/Xserver/Xserver/XsunMono/Makefile     Tue Dec 23 10:23:07 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/12/22 15:57:51 rtr Exp $
+#      $NetBSD: Makefile,v 1.3 2003/12/23 10:23:08 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -20,14 +20,13 @@
 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
+LDADD+=        ${LDADD.lbx} -llbxutil ${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} \
+       ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} \
+       -lXfont -lfreetype ${LDADD.dix/xpstubs} -lfreetype -lXau -lXdmcp -lz -lm
 
 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} \
+       ${LIBXEXT} ${DPADD.xkb} ${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.dbe} \
        ${DPADD.record} ${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} \
        ${DPADD.randr} ${DPADD.render} ${LIBXFONT} ${DPADD.dix/xpstubs} \
        ${LIBFREETYPE} ${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}

Prev by Date: [src/trunk]: src/sys/arch/pmax MAXINE keyboard and mouse now works, albeit wi...
Next by Date: [src/trunk]: src/share/mk Need to provide alternate definitions of __archive{...
Previous by Thread: [src/trunk]: src/sys/arch/pmax MAXINE keyboard and mouse now works, albeit wi...
Next by Thread: [src/trunk]: src/share/mk Need to provide alternate definitions of __archive{...
Indexes:

Home | Main Index | Thread Index | Old Index