Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't rely on libs built from Xserver anymore, they're going away, instead

Browse Source 
link to those installed (and were built from x11/lib)
Makefile.Xserver - don't create vars for dirs that soon won't exist.
This commit is contained in:
rtr 2003-12-23 10:23:07 +00:00
parent 109ee0636a
commit 22a5ed24db
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/Xserver/Xserver/Makefile.Xserver
View File

@ -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

10
x11/Xserver/Xserver/XFree86/Makefile
View File

@ -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+= ${LDADD.hw/xfree86/xf86} ${LDADD.hw/xfree86/xf86config} \
${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>

8
x11/Xserver/Xserver/Xsun/Makefile
View File

@ -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 @@ LDADD+= ${LDADD.xinput}
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}

13
x11/Xserver/Xserver/Xsun24/Makefile
View File

@ -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 @@ 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
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}

11
x11/Xserver/Xserver/XsunMono/Makefile
View File

@ -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 @@ 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
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}