[src/trunk]: src/tests/fs Reorder the library specifications, so that we don'...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8b0da6fc8da7
branches:  trunk
changeset: 757787:8b0da6fc8da7
user:      he <he%NetBSD.org@localhost>
date:      Thu Sep 23 09:39:14 2010 +0000

description:
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.

diffstat:

 tests/fs/ffs/Makefile |   7 +++----
 tests/fs/nfs/Makefile |  15 ++++++++-------
 tests/fs/vfs/Makefile |  12 +++++++-----
 3 files changed, 18 insertions(+), 16 deletions(-)

diffs (87 lines):

diff -r 7c7ce1d8417e -r 8b0da6fc8da7 tests/fs/ffs/Makefile
--- a/tests/fs/ffs/Makefile     Thu Sep 23 09:38:14 2010 +0000
+++ b/tests/fs/ffs/Makefile     Thu Sep 23 09:39:14 2010 +0000
@@ -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+=-lrumpdev_fss                                           # snapshot dev
 LDADD+=-lrumpdev_disk -lrumpdev                                        # disk device
 LDADD+=-lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet        # fifos
+VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
+LDADD+=-L${VFSTESTDIR} -lvfstest
 LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread                   # base
 
-VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
-LDADD+=-L${VFSTESTDIR} -lvfstest
-
 .include <bsd.test.mk>
diff -r 7c7ce1d8417e -r 8b0da6fc8da7 tests/fs/nfs/Makefile
--- a/tests/fs/nfs/Makefile     Thu Sep 23 09:38:14 2010 +0000
+++ b/tests/fs/nfs/Makefile     Thu Sep 23 09:39:14 2010 +0000
@@ -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 @@
 
 TESTS_C=       t_mountd
 
-LDADD+=-lrumpfs_ffs                                             # ffs
+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 -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread                    # base
+LDADD+=-lrumpnet_shmif                                                 # shmif
+LDADD+=-lrumpnet_netinet -lrumpnet_net -lrumpnet
+LDADD+=-lrump -lrumpuser -lpthread                             # base
 
 LDADD+=-lutil
 
-VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
-LDADD+=-L${VFSTESTDIR} -lvfstest
-
 .include <bsd.test.mk>
diff -r 7c7ce1d8417e -r 8b0da6fc8da7 tests/fs/vfs/Makefile
--- a/tests/fs/vfs/Makefile     Thu Sep 23 09:38:14 2010 +0000
+++ b/tests/fs/vfs/Makefile     Thu Sep 23 09:39:14 2010 +0000
@@ -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_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>