move libos.a down in the link line so its version of GetTimeInMillis() is
not the one linked (instead we get the version from libxnest.a and libxvfb.a) appropriately.
This commit is contained in:
parent
2402a07435
commit
12cdb6c3cf
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.3 2003/09/30 09:45:29 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2004/02/21 08:32:34 rtr Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
@ -8,7 +8,7 @@ PROG= Xnest
|
|||
|
||||
.include "../Makefile.Xserver"
|
||||
|
||||
LDADD+= ${LDADD.dix} ${LDADD.os} -lXau -lXdmcp ${LDADD.hw/xnest} \
|
||||
LDADD+= ${LDADD.dix} ${LDADD.hw/xnest} ${LDADD.os} -lXau -lXdmcp \
|
||||
${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} \
|
||||
-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
|
||||
${LDADD.mi} ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.3 2003/09/30 09:45:29 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2004/02/21 08:32:34 rtr Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
@ -7,8 +7,8 @@ PROG= Xvfb
|
|||
|
||||
.include "../Makefile.Xserver"
|
||||
|
||||
LDADD+= ${LDADD.dix} ${LDADD.os} -lXau -lXdmcp \
|
||||
${LDADD.hw/vfb} ${LDADD.fb} ${LDADD.mfb} ${LDADD.dix/xpstubs} \
|
||||
LDADD+= ${LDADD.dix} ${LDADD.hw/vfb} ${LDADD.os} -lXau -lXdmcp \
|
||||
${LDADD.fb} ${LDADD.mfb} ${LDADD.dix/xpstubs} \
|
||||
${LDADD.mi} ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} \
|
||||
${LDADD.lbx} -llbxutil ${LDADD.randr} ${LDADD.render} \
|
||||
${LDADD.mi} ${LDADD.Xext/ext} ${LDADD.dbe} ${LDADD.record} \
|
||||
|
|
Loading…
Reference in New Issue