From 0549224c7a89308c54f67039dbbf30ab78149986 Mon Sep 17 00:00:00 2001
From: he <he@NetBSD.org>
Date: Thu, 23 Sep 2010 09:39:14 +0000
Subject: [PATCH] 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.

---
 tests/fs/ffs/Makefile |  5 ++---
 tests/fs/nfs/Makefile | 19 ++++++++++---------
 tests/fs/vfs/Makefile | 12 +++++++-----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/tests/fs/ffs/Makefile b/tests/fs/ffs/Makefile
index 8c06392154fa..99b962de771f 100644
--- a/tests/fs/ffs/Makefile
+++ b/tests/fs/ffs/Makefile
@@ -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>
diff --git a/tests/fs/nfs/Makefile b/tests/fs/nfs/Makefile
index f5e0b05a7fd0..dd2608539a14 100644
--- a/tests/fs/nfs/Makefile
+++ b/tests/fs/nfs/Makefile
@@ -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>
diff --git a/tests/fs/vfs/Makefile b/tests/fs/vfs/Makefile
index 9cb000eb2f07..daac99cc7964 100644
--- a/tests/fs/vfs/Makefile
+++ b/tests/fs/vfs/Makefile
@@ -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>