Module Name: src
Committed By: he
Date: Tue Jun 10 04:28:40 UTC 2014
Modified Files:
src/tests/dev/scsipi: Makefile
src/tests/dev/sysmon: Makefile
src/tests/fs/kernfs: Makefile
src/tests/fs/nfs: Makefile
src/tests/fs/nullfs: Makefile
src/tests/fs/ptyfs: Makefile
src/tests/fs/puffs: Makefile
src/tests/fs/umapfs: Makefile
src/tests/fs/union: Makefile
src/tests/kernel: Makefile
src/tests/kernel/tty: Makefile
src/tests/lib/libc/sys: Makefile
src/tests/lib/semaphore/pthread: Makefile
src/tests/libexec: Makefile
src/tests/modules: Makefile
src/tests/net/bpf: Makefile
src/tests/net/bpfilter: Makefile
src/tests/net/carp: Makefile
src/tests/net/icmp: Makefile
src/tests/net/if: Makefile
src/tests/net/if_loop: Makefile
src/tests/net/net: Makefile
src/tests/rump/rumpkern: Makefile
src/tests/rump/rumpkern/h_server: Makefile
src/tests/rump/rumpvfs: Makefile
Log Message:
Fix static linking for the tests: -lrump is also used by -lrumpuser,
so we also need -lrump after -lrumpuser. Fixes build for sun2.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/dev/scsipi/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/dev/sysmon/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/kernfs/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/nfs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/nullfs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/ptyfs/Makefile
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/puffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/umapfs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/union/Makefile
cvs rdiff -u -r1.33 -r1.34 src/tests/kernel/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/tty/Makefile
cvs rdiff -u -r1.34 -r1.35 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/semaphore/pthread/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/libexec/Makefile
cvs rdiff -u -r1.10 -r1.11 src/tests/modules/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/net/bpf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/net/bpfilter/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/net/carp/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/net/icmp/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_loop/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tests/net/net/Makefile
cvs rdiff -u -r1.14 -r1.15 src/tests/rump/rumpkern/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/rump/rumpkern/h_server/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/rump/rumpvfs/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/dev/scsipi/Makefile
diff -u src/tests/dev/scsipi/Makefile:1.5 src/tests/dev/scsipi/Makefile:1.6
--- src/tests/dev/scsipi/Makefile:1.5 Fri Apr 25 00:24:39 2014
+++ src/tests/dev/scsipi/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/04/25 00:24:39 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/10 04:28:39 he Exp $
#
.include <bsd.own.mk>
@@ -18,6 +18,7 @@ LDADD+= -Wl,--whole-archive -lrumpdev_sc
LDADD+= -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs
LDADD+= -lrump -lutil
LDADD+= -lrumpuser -lpthread
+LDADD+= -lrump
WARNS= 4
Index: src/tests/dev/sysmon/Makefile
diff -u src/tests/dev/sysmon/Makefile:1.2 src/tests/dev/sysmon/Makefile:1.3
--- src/tests/dev/sysmon/Makefile:1.2 Mon Dec 20 04:56:18 2010
+++ src/tests/dev/sysmon/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/12/20 04:56:18 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $
#
.include <bsd.own.mk>
@@ -9,7 +9,9 @@ TESTS_C= t_swwdog
LDADD+= -lrumpdev_sysmon -lrumpdev -lrumpvfs
LDADD+= -lrump
-LDADD+= -lrumpuser -lpthread
+LDADD+= -lrumpuser
+LDADD+= -lrump
+LDADD+= -lpthread
WARNS= 4
Index: src/tests/fs/kernfs/Makefile
diff -u src/tests/fs/kernfs/Makefile:1.3 src/tests/fs/kernfs/Makefile:1.4
--- src/tests/fs/kernfs/Makefile:1.3 Tue Jun 8 10:43:40 2010
+++ src/tests/fs/kernfs/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/08 10:43:40 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
#
TESTSDIR= ${TESTSBASE}/fs/kernfs
@@ -9,6 +9,6 @@ TESTS_C= t_basic
.include <bsd.own.mk>
LDADD+= -lrumpfs_kernfs # fs driver
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
.include <bsd.test.mk>
Index: src/tests/fs/nfs/Makefile
diff -u src/tests/fs/nfs/Makefile:1.8 src/tests/fs/nfs/Makefile:1.9
--- src/tests/fs/nfs/Makefile:1.8 Fri Feb 24 13:53:46 2012
+++ src/tests/fs/nfs/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/02/24 13:53:46 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/06/10 04:28:39 he Exp $
#
.include <bsd.own.mk>
@@ -22,7 +22,7 @@ LDADD+=-lrumpfs_ffs -lrumpvfs
LDADD+=-lrumpdev_disk -lrumpdev # disk device
LDADD+=-lrumpnet_shmif # shmif
LDADD+=-lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=-lrump -lrumpuser -lpthread # base
+LDADD+=-lrump -lrumpuser -lrump -lpthread # base
LDADD+=-lutil
Index: src/tests/fs/nullfs/Makefile
diff -u src/tests/fs/nullfs/Makefile:1.3 src/tests/fs/nullfs/Makefile:1.4
--- src/tests/fs/nullfs/Makefile:1.3 Sat Apr 10 21:33:01 2010
+++ src/tests/fs/nullfs/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/04/10 21:33:01 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
#
TESTSDIR= ${TESTSBASE}/fs/nullfs
@@ -7,6 +7,6 @@ WARNS= 4
TESTS_C= t_basic
LDADD+= -lrumpfs_tmpfs -lrumpfs_null -lrumpvfs_layerfs # fs drivers
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
.include <bsd.test.mk>
Index: src/tests/fs/ptyfs/Makefile
diff -u src/tests/fs/ptyfs/Makefile:1.4 src/tests/fs/ptyfs/Makefile:1.5
--- src/tests/fs/ptyfs/Makefile:1.4 Thu Oct 13 17:23:29 2011
+++ src/tests/fs/ptyfs/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/10/13 17:23:29 plunky Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/10 04:28:39 he Exp $
#
TESTSDIR= ${TESTSBASE}/fs/ptyfs
@@ -9,7 +9,7 @@ TESTS_C+= t_nullpts
LDADD+= -lrumpfs_ptyfs # fs drivers
LDADD+= -lrumpkern_tty # tty support
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
LDADD.t_nullpts+= -lrumpfs_null -lrumpvfs_layerfs
Index: src/tests/fs/puffs/Makefile
diff -u src/tests/fs/puffs/Makefile:1.13 src/tests/fs/puffs/Makefile:1.14
--- src/tests/fs/puffs/Makefile:1.13 Fri Nov 12 17:35:34 2010
+++ src/tests/fs/puffs/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/11/12 17:35:34 pooka Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/10 04:28:39 he Exp $
#
.include <bsd.own.mk>
@@ -18,7 +18,7 @@ LDADD+= -lrumpdev_putter -lrumpdev
LDADD+= -lrumpfs_syspuffs -lrumpvfs_fifofs
LDADD+= -lrumpnet_local -lrumpnet_net -lrumpnet
LDADD+= -lrumpvfs
-LDADD+= -lrump -lrumpuser -lpthread
+LDADD+= -lrump -lrumpuser -lrump -lpthread
# required by -DPUFFSDUMP
#LDADD+= -lpuffs -lutil
Index: src/tests/fs/umapfs/Makefile
diff -u src/tests/fs/umapfs/Makefile:1.3 src/tests/fs/umapfs/Makefile:1.4
--- src/tests/fs/umapfs/Makefile:1.3 Sun Apr 11 05:45:57 2010
+++ src/tests/fs/umapfs/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/04/11 05:45:57 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
#
TESTSDIR= ${TESTSBASE}/fs/umapfs
@@ -7,6 +7,6 @@ WARNS= 4
TESTS_C= t_basic
LDADD+= -lrumpfs_tmpfs -lrumpfs_umap -lrumpvfs_layerfs # fs drivers
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
.include <bsd.test.mk>
Index: src/tests/fs/union/Makefile
diff -u src/tests/fs/union/Makefile:1.3 src/tests/fs/union/Makefile:1.4
--- src/tests/fs/union/Makefile:1.3 Wed Jan 12 21:13:26 2011
+++ src/tests/fs/union/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/01/12 21:13:26 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
#
TESTSDIR= ${TESTSBASE}/fs/union
@@ -8,6 +8,6 @@ TESTS_C= t_pr
LDADD+= -lrumpfs_union -lrumpvfs_layerfs -lrumpfs_ffs # fs drivers
LDADD+= -lrumpdev_disk -lrumpdev # disk device
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
.include <bsd.test.mk>
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.33 src/tests/kernel/Makefile:1.34
--- src/tests/kernel/Makefile:1.33 Tue Apr 16 22:05:44 2013
+++ src/tests/kernel/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2013/04/16 22:05:44 mlelstv Exp $
+# $NetBSD: Makefile,v 1.34 2014/06/10 04:28:39 he Exp $
NOMAN= # defined
@@ -32,9 +32,11 @@ TESTS_SUBDIRS+= tty
TESTS_C+= t_extattrctl
TESTS_C+= t_filedesc
TESTS_C+= t_rnd
-LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser
+LDADD.t_extattrctl+= -lrump -lpthread
LDADD.t_filedesc+= ${LDADD.t_rnd}
-LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
+LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser
+LDADD.t_rnd+= -lrump -lpthread
.endif
Index: src/tests/kernel/tty/Makefile
diff -u src/tests/kernel/tty/Makefile:1.1 src/tests/kernel/tty/Makefile:1.2
--- src/tests/kernel/tty/Makefile:1.1 Mon Jun 28 19:04:00 2010
+++ src/tests/kernel/tty/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/06/28 19:04:00 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:39 he Exp $
.include <bsd.own.mk>
@@ -6,6 +6,8 @@ TESTSDIR= ${TESTSBASE}/kernel/tty
TESTS_C= t_pr
-LDADD+= -lrumpkern_tty -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+= -lrumpkern_tty -lrumpvfs -lrump -lrumpuser
+LDADD+= -lrump
+LDADD+= -lpthread
.include <bsd.test.mk>
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.34 src/tests/lib/libc/sys/Makefile:1.35
--- src/tests/lib/libc/sys/Makefile:1.34 Wed Jul 24 11:45:48 2013
+++ src/tests/lib/libc/sys/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/07/24 11:45:48 skrll Exp $
+# $NetBSD: Makefile,v 1.35 2014/06/10 04:28:39 he Exp $
MKMAN= no
@@ -70,7 +70,7 @@ LDADD.t_getpid+= -lpthread
.if (${MKRUMP} != "no")
TESTS_C+= t_posix_fadvise
-LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
.endif
WARNS= 4
Index: src/tests/lib/semaphore/pthread/Makefile
diff -u src/tests/lib/semaphore/pthread/Makefile:1.2 src/tests/lib/semaphore/pthread/Makefile:1.3
--- src/tests/lib/semaphore/pthread/Makefile:1.2 Sat Mar 10 21:58:49 2012
+++ src/tests/lib/semaphore/pthread/Makefile Tue Jun 10 04:28:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/10 21:58:49 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ TESTS_C= t_sem_pth
CPPFLAGS+= -I${.CURDIR}/..
-LDADD+= -lrump -lrumpuser -lpthread
+LDADD+= -lrump -lrumpuser -lrump -lpthread
WARNS= 4
Index: src/tests/libexec/Makefile
diff -u src/tests/libexec/Makefile:1.3 src/tests/libexec/Makefile:1.4
--- src/tests/libexec/Makefile:1.3 Sat Jun 11 18:03:19 2011
+++ src/tests/libexec/Makefile Tue Jun 10 04:28:39 2014
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2011/06/11 18:03:19 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
#
.include "Makefile.inc"
.include <bsd.own.mk>
+.if ${MACHINE_ARCH} != "m68000"
TESTS_SUBDIRS= ld.elf_so
+.endif
TESTSDIR= ${TESTSBASE}/libexec
Index: src/tests/modules/Makefile
diff -u src/tests/modules/Makefile:1.10 src/tests/modules/Makefile:1.11
--- src/tests/modules/Makefile:1.10 Fri Apr 13 07:05:32 2012
+++ src/tests/modules/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/04/13 07:05:32 jruoho Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/10 04:28:40 he Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@ TESTSDIR= ${TESTSBASE}/modules
TESTS_C= t_modctl
TESTS_C+= t_builtin
LDADD= -lprop
-LDADD+= -lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+= -lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lrump -lpthread
TESTS_SH= t_abi_uvm
TESTS_SH+= t_modload
Index: src/tests/net/bpf/Makefile
diff -u src/tests/net/bpf/Makefile:1.3 src/tests/net/bpf/Makefile:1.4
--- src/tests/net/bpf/Makefile:1.3 Mon Jan 3 02:53:15 2011
+++ src/tests/net/bpf/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/01/03 02:53:15 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:40 he Exp $
#
.include <bsd.own.mk>
@@ -10,6 +10,6 @@ TESTS_C+= t_div-by-zero
LDADD+= -lrumpnet_shmif
LDADD+= -lrumpdev_bpf -lrumpdev -lrumpnet_netinet -lrumpnet_net
-LDADD+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lrump -lpthread
.include <bsd.test.mk>
Index: src/tests/net/bpfilter/Makefile
diff -u src/tests/net/bpfilter/Makefile:1.1 src/tests/net/bpfilter/Makefile:1.2
--- src/tests/net/bpfilter/Makefile:1.1 Tue Aug 14 19:09:15 2012
+++ src/tests/net/bpfilter/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/08/14 19:09:15 alnsn Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:40 he Exp $
#
.include <bsd.own.mk>
@@ -9,6 +9,6 @@ TESTS_C= t_bpfilter
LDADD+= -lrumpnet_shmif
LDADD+= -lrumpdev_bpf -lrumpdev -lrumpnet_netinet -lrumpnet_net
-LDADD+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lrump -lpthread
.include <bsd.test.mk>
Index: src/tests/net/carp/Makefile
diff -u src/tests/net/carp/Makefile:1.1 src/tests/net/carp/Makefile:1.2
--- src/tests/net/carp/Makefile:1.1 Tue Aug 10 21:55:28 2010
+++ src/tests/net/carp/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/08/10 21:55:28 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:40 he Exp $
#
.include <bsd.own.mk>
@@ -8,6 +8,6 @@ TESTSDIR= ${TESTSBASE}/net/carp
TESTS_C= t_basic
LDADD+= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net
-LDADD+= -lrumpnet -lrump -lrumpuser -lpthread
+LDADD+= -lrumpnet -lrump -lrumpuser -lrump -lpthread
.include <bsd.test.mk>
Index: src/tests/net/icmp/Makefile
diff -u src/tests/net/icmp/Makefile:1.3 src/tests/net/icmp/Makefile:1.4
--- src/tests/net/icmp/Makefile:1.3 Tue Dec 14 11:03:17 2010
+++ src/tests/net/icmp/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/12/14 11:03:17 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:40 he Exp $
#
.include <bsd.own.mk>
@@ -11,6 +11,6 @@ TESTS_C+= t_ping
TESTS_SH= t_ping2
LDADD+= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpuser -lpthread
+LDADD+= -lrump -lrumpuser -lrump -lpthread
.include <bsd.test.mk>
Index: src/tests/net/if/Makefile
diff -u src/tests/net/if/Makefile:1.1 src/tests/net/if/Makefile:1.2
--- src/tests/net/if/Makefile:1.1 Sun Nov 7 19:53:42 2010
+++ src/tests/net/if/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/11/07 19:53:42 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:40 he Exp $
#
.include <bsd.own.mk>
@@ -8,6 +8,6 @@ TESTSDIR= ${TESTSBASE}/net/if
TESTS_C= t_compat
LDADD+= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump
-LDADD+= -lrumpuser -lpthread
+LDADD+= -lrumpuser -lrump -lpthread
.include <bsd.test.mk>
Index: src/tests/net/if_loop/Makefile
diff -u src/tests/net/if_loop/Makefile:1.1 src/tests/net/if_loop/Makefile:1.2
--- src/tests/net/if_loop/Makefile:1.1 Sun Jul 25 21:42:08 2010
+++ src/tests/net/if_loop/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/25 21:42:08 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:40 he Exp $
#
.include <bsd.own.mk>
@@ -8,6 +8,6 @@ TESTSDIR= ${TESTSBASE}/net/if_loop
TESTS_C= t_pr
LDADD+= -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpuser -lpthread
+LDADD+= -lrump -lrumpuser -lrump -lpthread
.include <bsd.test.mk>
Index: src/tests/net/net/Makefile
diff -u src/tests/net/net/Makefile:1.7 src/tests/net/net/Makefile:1.8
--- src/tests/net/net/Makefile:1.7 Sat Oct 12 15:29:16 2013
+++ src/tests/net/net/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/10/12 15:29:16 christos Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/10 04:28:40 he Exp $
#
.include <bsd.own.mk>
@@ -13,7 +13,7 @@ TESTS_C+= t_pktinfo
TESTS_C+= t_raw
.endif
-LDADD.t_raw+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net
-LDADD.t_raw+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_raw+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net
+LDADD.t_raw+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lrump -lpthread
.include <bsd.test.mk>
Index: src/tests/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.14 src/tests/rump/rumpkern/Makefile:1.15
--- src/tests/rump/rumpkern/Makefile:1.14 Fri Jan 14 13:23:15 2011
+++ src/tests/rump/rumpkern/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/01/14 13:23:15 pooka Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/10 04:28:40 he Exp $
.include <bsd.own.mk>
@@ -18,7 +18,7 @@ TESTS_SH= t_sp
SUBDIR+= h_client h_server
-ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lpthread
+ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
LDADD.t_modlinkset+= -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos
LDADD.t_modlinkset+= -lrumpfs_cd9660 ${ADD_TO_LD}
LDADD+= ${ADD_TO_LD}
Index: src/tests/rump/rumpkern/h_server/Makefile
diff -u src/tests/rump/rumpkern/h_server/Makefile:1.3 src/tests/rump/rumpkern/h_server/Makefile:1.4
--- src/tests/rump/rumpkern/h_server/Makefile:1.3 Fri Jan 14 13:23:15 2011
+++ src/tests/rump/rumpkern/h_server/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/01/14 13:23:15 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:40 he Exp $
#
.include <bsd.own.mk>
@@ -9,7 +9,7 @@ TESTS_C= h_simpleserver
ATFFILE= no
-LDADD+= -lrump -lrumpuser -lpthread
+LDADD+= -lrump -lrumpuser -lrump -lpthread
WARNS= 4
NOMAN=
Index: src/tests/rump/rumpvfs/Makefile
diff -u src/tests/rump/rumpvfs/Makefile:1.3 src/tests/rump/rumpvfs/Makefile:1.4
--- src/tests/rump/rumpvfs/Makefile:1.3 Tue Feb 22 10:36:14 2011
+++ src/tests/rump/rumpvfs/Makefile Tue Jun 10 04:28:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/22 10:36:14 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:40 he Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ TESTS_C= t_basic
TESTS_C+= t_etfs
TESTS_C+= t_p2kifs
-LDADD= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
WARNS= 4
