Thu Sep 23 09:39:14 2010 UTC ()
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.


(he)
diff -r1.11 -r1.12 src/tests/fs/ffs/Makefile
diff -r1.3 -r1.4 src/tests/fs/nfs/Makefile
diff -r1.11 -r1.12 src/tests/fs/vfs/Makefile
cvs diff -r1.11 -r1.12 src/tests/fs/ffs/Makefile (expand / switch to unified diff)

--- src/tests/fs/ffs/Makefile 2010/07/19 16:32:01 1.11
+++ src/tests/fs/ffs/Makefile 2010/09/23 09:39:14 1.12
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.11 2010/07/19 16:32:01 pooka Exp $ 1# $NetBSD: Makefile,v 1.12 2010/09/23 09:39:14 he Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/fs/ffs 6TESTSDIR= ${TESTSBASE}/fs/ffs
7WARNS= 4 7WARNS= 4
8 8
9TESTS_C+= t_fifos 9TESTS_C+= t_fifos
10TESTS_C+= t_snapshot 10TESTS_C+= t_snapshot
11TESTS_C+= t_mount 11TESTS_C+= t_mount
12 12
13LDADD+=-lrumpfs_ffs # ffs 13LDADD+=-lrumpfs_ffs # ffs
14LDADD+=-lrumpdev_fss # snapshot dev 14LDADD+=-lrumpdev_fss # snapshot dev
15LDADD+=-lrumpdev_disk -lrumpdev # disk device 15LDADD+=-lrumpdev_disk -lrumpdev # disk device
16LDADD+=-lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet # fifos 16LDADD+=-lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet # fifos
17LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base 
18 
19VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR} 17VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
20LDADD+=-L${VFSTESTDIR} -lvfstest 18LDADD+=-L${VFSTESTDIR} -lvfstest
 19LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
21 20
22.include <bsd.test.mk> 21.include <bsd.test.mk>
cvs diff -r1.3 -r1.4 src/tests/fs/nfs/Makefile (expand / switch to unified diff)

--- src/tests/fs/nfs/Makefile 2010/07/28 19:23:01 1.3
+++ src/tests/fs/nfs/Makefile 2010/09/23 09:39:14 1.4
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.3 2010/07/28 19:23:01 pooka Exp $ 1# $NetBSD: Makefile,v 1.4 2010/09/23 09:39:14 he Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/fs/nfs 6TESTSDIR= ${TESTSBASE}/fs/nfs
7 7
8SUBDIR+= nfsservice 8SUBDIR+= nfsservice
9 9
10TESTS_C= t_mountd 10TESTS_C= t_mountd
11 11
12LDADD+=-lrumpfs_ffs # ffs 12VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 13LDADD+=-L${VFSTESTDIR} -lvfstest
 14
13LDADD+=-lrumpfs_nfs # NFS 15LDADD+=-lrumpfs_nfs # NFS
 16LDADD+=-lrumpfs_ffs -lrumpvfs # ffs
14LDADD+=-lrumpdev_disk -lrumpdev # disk device 17LDADD+=-lrumpdev_disk -lrumpdev # disk device
15LDADD+=-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet 18LDADD+=-lrumpnet_shmif # shmif
16LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base 19LDADD+=-lrumpnet_netinet -lrumpnet_net -lrumpnet
 20LDADD+=-lrump -lrumpuser -lpthread # base
17 21
18LDADD+=-lutil 22LDADD+=-lutil
19 23
20VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR} 
21LDADD+=-L${VFSTESTDIR} -lvfstest 
22 
23.include <bsd.test.mk> 24.include <bsd.test.mk>
cvs diff -r1.11 -r1.12 src/tests/fs/vfs/Makefile (expand / switch to unified diff)

--- src/tests/fs/vfs/Makefile 2010/08/19 02:36:02 1.11
+++ src/tests/fs/vfs/Makefile 2010/09/23 09:39:14 1.12
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.11 2010/08/19 02:36:02 pooka Exp $ 1# $NetBSD: Makefile,v 1.12 2010/09/23 09:39:14 he Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/fs/vfs 6TESTSDIR= ${TESTSBASE}/fs/vfs
7WARNS= 4 7WARNS= 4
8 8
9TESTS_C+= t_full 9TESTS_C+= t_full
10TESTS_C+= t_io 10TESTS_C+= t_io
11TESTS_C+= t_renamerace 11TESTS_C+= t_renamerace
12TESTS_C+= t_rmdirrace 12TESTS_C+= t_rmdirrace
13TESTS_C+= t_vfsops 13TESTS_C+= t_vfsops
14TESTS_C+= t_vnops 14TESTS_C+= t_vnops
15 15
16LDADD+=-lrumpfs_ext2fs # ext2fs 16LDADD+=-lrumpfs_ext2fs # ext2fs
17LDADD+=-lrumpfs_ffs # ffs 17LDADD+=-lrumpfs_ffs # ffs
18LDADD+=-lrumpfs_lfs # lfs 18LDADD+=-lrumpfs_lfs # lfs
19LDADD+=-lrumpfs_msdos # msdos 19LDADD+=-lrumpfs_msdos # msdos
20LDADD+=-lrumpfs_nfs # NFS 
21LDADD+=-lrumpfs_syspuffs # puffs 20LDADD+=-lrumpfs_syspuffs # puffs
22LDADD+=-lrumpdev_putter -lrumpdev # \ putter 21LDADD+=-lrumpdev_putter -lrumpdev # \ putter
23LDADD+=-lrumpfs_sysvbfs # sysvbfs 22LDADD+=-lrumpfs_sysvbfs # sysvbfs
24LDADD+=-lrumpfs_tmpfs # tmpfs 23LDADD+=-lrumpfs_tmpfs # tmpfs
25LDADD+=-lrumpdev_disk -lrumpdev # disk device 24LDADD+=-lrumpdev_disk -lrumpdev # disk device
26LDADD+=-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet 
27LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base 
28 25
29LDADD+=-lutil 
30 26
31VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR} 27VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
32LDADD+=-L${VFSTESTDIR} -lvfstest 28LDADD+=-L${VFSTESTDIR} -lvfstest
33 29
 30LDADD+=-lrumpfs_nfs # NFS
 31LDADD+=-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
 32LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
 33
 34LDADD+=-lutil
 35
34.include <bsd.test.mk> 36.include <bsd.test.mk>