Module Name: src
Committed By: he
Date: Thu Sep 23 09:39:14 UTC 2010
Modified Files:
src/tests/fs/ffs: Makefile
src/tests/fs/nfs: Makefile
src/tests/fs/vfs: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/fs/ffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/nfs/Makefile
cvs rdiff -u -r1.11 -r1.12 src/tests/fs/vfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.11 src/tests/fs/ffs/Makefile:1.12
--- src/tests/fs/ffs/Makefile:1.11 Mon Jul 19 16:32:01 2010
+++ src/tests/fs/ffs/Makefile Thu Sep 23 09:39:14 2010
@@ -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
-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>
Index: src/tests/fs/nfs/Makefile
diff -u src/tests/fs/nfs/Makefile:1.3 src/tests/fs/nfs/Makefile:1.4
--- src/tests/fs/nfs/Makefile:1.3 Wed Jul 28 19:23:01 2010
+++ src/tests/fs/nfs/Makefile Thu Sep 23 09:39:14 2010
@@ -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>
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.11 src/tests/fs/vfs/Makefile:1.12
--- src/tests/fs/vfs/Makefile:1.11 Thu Aug 19 02:36:02 2010
+++ src/tests/fs/vfs/Makefile Thu Sep 23 09:39:14 2010
@@ -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
-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+=-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
+LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
+
+LDADD+=-lutil
+
.include <bsd.test.mk>
