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

Reorder the library specifications, so that we don't depend on the 

library dependencies recorded in shared libraries, allowing these
to be linked statically as well.
This commit is contained in:
he 2010-09-23 09:39:14 +00:00
parent 16b74f200d
commit 0549224c7a
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/fs/ffs/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2010/07/19 16:32:01 pooka Exp $
# $NetBSD: Makefile,v 1.12 2010/09/23 09:39:14 he Exp $
#
.include <bsd.own.mk>
@ -14,9 +14,8 @@ LDADD+=-lrumpfs_ffs # ffs
LDADD+=-lrumpdev_fss # snapshot dev
LDADD+=-lrumpdev_disk -lrumpdev # disk device
LDADD+=-lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet # fifos
LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
LDADD+=-L${VFSTESTDIR} -lvfstest
LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
.include <bsd.test.mk>

19
tests/fs/nfs/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2010/07/28 19:23:01 pooka Exp $
# $NetBSD: Makefile,v 1.4 2010/09/23 09:39:14 he Exp $
#
.include <bsd.own.mk>
@ -9,15 +9,16 @@ SUBDIR+= nfsservice
TESTS_C= t_mountd
LDADD+=-lrumpfs_ffs # ffs
LDADD+=-lrumpfs_nfs # NFS
LDADD+=-lrumpdev_disk -lrumpdev # disk device
LDADD+=-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
LDADD+=-lutil
VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
LDADD+=-L${VFSTESTDIR} -lvfstest
LDADD+=-lrumpfs_nfs # NFS
LDADD+=-lrumpfs_ffs -lrumpvfs # ffs
LDADD+=-lrumpdev_disk -lrumpdev # disk device
LDADD+=-lrumpnet_shmif # shmif
LDADD+=-lrumpnet_netinet -lrumpnet_net -lrumpnet
LDADD+=-lrump -lrumpuser -lpthread # base
LDADD+=-lutil
.include <bsd.test.mk>

12
tests/fs/vfs/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2010/08/19 02:36:02 pooka Exp $
# $NetBSD: Makefile,v 1.12 2010/09/23 09:39:14 he Exp $
#
.include <bsd.own.mk>
@ -17,18 +17,20 @@ LDADD+=-lrumpfs_ext2fs # ext2fs
LDADD+=-lrumpfs_ffs # ffs
LDADD+=-lrumpfs_lfs # lfs
LDADD+=-lrumpfs_msdos # msdos
LDADD+=-lrumpfs_nfs # NFS
LDADD+=-lrumpfs_syspuffs # puffs
LDADD+=-lrumpdev_putter -lrumpdev # \ putter
LDADD+=-lrumpfs_sysvbfs # sysvbfs
LDADD+=-lrumpfs_tmpfs # tmpfs
LDADD+=-lrumpdev_disk -lrumpdev # disk device
VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
LDADD+=-L${VFSTESTDIR} -lvfstest
LDADD+=-lrumpfs_nfs # NFS
LDADD+=-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
LDADD+=-lutil
VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
LDADD+=-L${VFSTESTDIR} -lvfstest
.include <bsd.test.mk>