Module Name: src
Committed By: christos
Date: Sun Mar 1 18:08:16 UTC 2020
Modified Files:
src/tests: Makefile.inc
src/tests/dev/audio: Makefile
src/tests/dev/cgd: Makefile
src/tests/dev/dm: Makefile
src/tests/dev/md: Makefile
src/tests/dev/scsipi: Makefile
src/tests/dev/sysmon: Makefile
src/tests/dev/usb/t_hid: Makefile
src/tests/fs/ffs: Makefile
src/tests/fs/hfs: Makefile
src/tests/fs/kernfs: Makefile
src/tests/fs/lfs: Makefile
src/tests/fs/msdosfs: Makefile
src/tests/fs/nfs: Makefile
src/tests/fs/nfs/nfsservice: Makefile
src/tests/fs/nullfs: Makefile
src/tests/fs/ptyfs: Makefile
src/tests/fs/puffs: Makefile
src/tests/fs/tmpfs: Makefile
src/tests/fs/umapfs: Makefile
src/tests/fs/union: Makefile
src/tests/fs/vfs: Makefile
src/tests/include/sys: Makefile
src/tests/kernel: Makefile
src/tests/kernel/tty: Makefile
src/tests/lib/libc/sys: Makefile
src/tests/lib/semaphore/pthread: Makefile
src/tests/modules: Makefile
src/tests/net/bpf: Makefile
src/tests/net/bpfilter: Makefile
src/tests/net/bpfjit: Makefile
src/tests/net/can: 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:
Centralize the base rump libraries into a variable used by all the other
Makefiles so that we can make changes to it centrally as needed and have
less mess. Fixes the sun2 build that needs rumpvfs after librump after
the latest changes.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/tests/dev/audio/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/dev/cgd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/dev/dm/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/dev/md/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tests/dev/scsipi/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/dev/sysmon/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/dev/usb/t_hid/Makefile
cvs rdiff -u -r1.19 -r1.20 src/tests/fs/ffs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/hfs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/kernfs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/lfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/msdosfs/Makefile
cvs rdiff -u -r1.10 -r1.11 src/tests/fs/nfs/Makefile
cvs rdiff -u -r1.14 -r1.15 src/tests/fs/nfs/nfsservice/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/nullfs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/ptyfs/Makefile
cvs rdiff -u -r1.14 -r1.15 src/tests/fs/puffs/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/tmpfs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/umapfs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/union/Makefile
cvs rdiff -u -r1.25 -r1.26 src/tests/fs/vfs/Makefile
cvs rdiff -u -r1.14 -r1.15 src/tests/include/sys/Makefile
cvs rdiff -u -r1.65 -r1.66 src/tests/kernel/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/kernel/tty/Makefile
cvs rdiff -u -r1.58 -r1.59 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/semaphore/pthread/Makefile
cvs rdiff -u -r1.17 -r1.18 src/tests/modules/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/net/bpf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/net/bpfilter/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tests/net/bpfjit/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/net/can/Makefile
cvs rdiff -u -r1.11 -r1.12 src/tests/net/icmp/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/net/if/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/net/if_loop/Makefile
cvs rdiff -u -r1.22 -r1.23 src/tests/net/net/Makefile
cvs rdiff -u -r1.18 -r1.19 src/tests/rump/rumpkern/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/rump/rumpkern/h_server/Makefile
cvs rdiff -u -r1.4 -r1.5 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/Makefile.inc
diff -u src/tests/Makefile.inc:1.5 src/tests/Makefile.inc:1.6
--- src/tests/Makefile.inc:1.5 Fri Jan 13 20:33:32 2017
+++ src/tests/Makefile.inc Sun Mar 1 13:08:12 2020
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.5 2017/01/14 01:33:32 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2020/03/01 18:08:12 christos Exp $
WARNS ?= 4
CWARNFLAGS+= -Wno-missing-noreturn
TOOLSSRCDIR:= ${.PARSEDIR}
CPPFLAGS+= -I${TOOLSSRCDIR}
+LIBRUMPBASE = -lrumpvfs -lrump -lrumpvfs -lrumpuser -lrump -lpthread
+
Index: src/tests/dev/audio/Makefile
diff -u src/tests/dev/audio/Makefile:1.7 src/tests/dev/audio/Makefile:1.8
--- src/tests/dev/audio/Makefile:1.7 Tue Feb 11 02:03:16 2020
+++ src/tests/dev/audio/Makefile Sun Mar 1 13:08:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/02/11 07:03:16 isaki Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/01 18:08:12 christos Exp $
#
.include <bsd.own.mk>
@@ -21,11 +21,7 @@ BINDIR= ${TESTSDIR}
MKMAN=no
CPPFLAGS+= -D_KERNTYPES
-LDADD+= -lrumpdev_pad -lrumpdev_audio -lrumpdev -lrumpvfs
-LDADD+= -lrump
-LDADD+= -lrumpuser
-LDADD+= -lrump
-LDADD+= -lpthread
+LDADD+= -lrumpdev_pad -lrumpdev_audio ${LIBRUMPBASE}
WARNS= 4
NOMAN=
Index: src/tests/dev/cgd/Makefile
diff -u src/tests/dev/cgd/Makefile:1.9 src/tests/dev/cgd/Makefile:1.10
--- src/tests/dev/cgd/Makefile:1.9 Sun Mar 1 12:06:26 2020
+++ src/tests/dev/cgd/Makefile Sun Mar 1 13:08:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/03/01 17:06:26 christos Exp $
+# $NetBSD: Makefile,v 1.10 2020/03/01 18:08:12 christos Exp $
#
.include <bsd.own.mk>
@@ -14,11 +14,8 @@ TESTS_C= t_cgd_3des t_cgd_aes t_cgd_blow
WARNS= 4
CPPFLAGS+= -D_KERNTYPES
-LDADD+= -lrumpdev -lrumpdev_disk -lrumpdev_cgd -lrumpkern_crypto -lrumpvfs
-LDADD+= -lrump -lrumpvfs
-LDADD+= -lrumpuser
-LDADD+= -lrump -lutil
-LDADD+= -lpthread
+LDADD+= -lrumpdev -lrumpdev_disk -lrumpdev_cgd -lrumpkern_crypto ${LIBRUMPBASE}
+LDADD+= -lutil
.endif
.include <bsd.test.mk>
Index: src/tests/dev/dm/Makefile
diff -u src/tests/dev/dm/Makefile:1.3 src/tests/dev/dm/Makefile:1.4
--- src/tests/dev/dm/Makefile:1.3 Sat Jan 23 16:22:48 2016
+++ src/tests/dev/dm/Makefile Sun Mar 1 13:08:12 2020
@@ -1,5 +1,4 @@
-
-# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:48 christos Exp $
+# $NetBSD: Makefile,v 1.4 2020/03/01 18:08:12 christos Exp $
#
.include <bsd.own.mk>
@@ -16,10 +15,7 @@ PROGS= h_dm
CPPFLAGS+=-D_KERNTYPES
LDADD+= -lprop -lutil
-LDADD+= -lrumpdev_disk -lrumpdev_dm
-LDADD+= -lrumpdev -lrumpvfs
-LDADD+= -lrump
-LDADD+= -lrumpuser -lpthread
+LDADD+= -lrumpdev_disk -lrumpdev_dm ${LIBRUMPBASE}
FILES= t_dm_disk_1.bz2.uue t_dm_disk_2.bz2.uue t_dm_disk_3.bz2.uue
Index: src/tests/dev/md/Makefile
diff -u src/tests/dev/md/Makefile:1.6 src/tests/dev/md/Makefile:1.7
--- src/tests/dev/md/Makefile:1.6 Sat Jan 23 16:22:48 2016
+++ src/tests/dev/md/Makefile Sun Mar 1 13:08:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:48 christos Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/01 18:08:13 christos Exp $
#
.include <bsd.own.mk>
@@ -14,10 +14,8 @@ MKMAN=no
PROGS= h_mdserv
CPPFLAGS+= -D_KERNTYPES
-LDADD+= -lrumpdev_md -lrumpdev_disk -lrumpdev -lrumpvfs
-LDADD+= -lrumpkern_sysproxy -lrump
-LDADD+= -lrumpuser
-LDADD+= -lpthread
+LDADD+= -lrumpdev_md -lrumpdev_disk -lrumpdev
+LDADD+= -lrumpkern_sysproxy ${LIBRUMPBASE}
WARNS= 4
NOMAN=
Index: src/tests/dev/scsipi/Makefile
diff -u src/tests/dev/scsipi/Makefile:1.7 src/tests/dev/scsipi/Makefile:1.8
--- src/tests/dev/scsipi/Makefile:1.7 Sat Jan 23 16:22:48 2016
+++ src/tests/dev/scsipi/Makefile Sun Mar 1 13:08:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:48 christos Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/01 18:08:13 christos Exp $
#
.include <bsd.own.mk>
@@ -15,10 +15,8 @@ SCSITESTDIR!= cd ${.CURDIR}/libscsitest
LDFLAGS+= -L${SCSITESTDIR}
LDADD+= -Wl,--whole-archive -lrumpdev_scsitest -Wl,--no-whole-archive
-LDADD+= -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs
-LDADD+= -lrump -lutil
-LDADD+= -lrumpuser -lpthread
-LDADD+= -lrump
+LDADD+= -lrumpdev_scsipi -lrumpdev_disk -lrumpdev ${LIBRUMPBASE}
+LDADD+= -lutil
WARNS= 4
Index: src/tests/dev/sysmon/Makefile
diff -u src/tests/dev/sysmon/Makefile:1.4 src/tests/dev/sysmon/Makefile:1.5
--- src/tests/dev/sysmon/Makefile:1.4 Sat Jan 23 16:22:48 2016
+++ src/tests/dev/sysmon/Makefile Sun Mar 1 13:08:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:48 christos Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 18:08:13 christos Exp $
#
.include <bsd.own.mk>
@@ -8,11 +8,7 @@ TESTSDIR= ${TESTSBASE}/dev/sysmon
TESTS_C= t_swwdog
CPPFLAGS+= -D_KERNTYPES
-LDADD+= -lrumpdev_sysmon -lrumpdev -lrumpvfs
-LDADD+= -lrump
-LDADD+= -lrumpuser
-LDADD+= -lrump
-LDADD+= -lpthread
+LDADD+= -lrumpdev_sysmon -lrumpdev ${LIBRUMPBASE}
WARNS= 4
Index: src/tests/dev/usb/t_hid/Makefile
diff -u src/tests/dev/usb/t_hid/Makefile:1.3 src/tests/dev/usb/t_hid/Makefile:1.4
--- src/tests/dev/usb/t_hid/Makefile:1.3 Sat Jun 1 02:59:17 2019
+++ src/tests/dev/usb/t_hid/Makefile Sun Mar 1 13:08:13 2020
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2019/06/01 06:59:17 kre Exp $
+# $NetBSD: Makefile,v 1.4 2020/03/01 18:08:13 christos Exp $
#
-PROG= t_hid
NOMAN=
+.include <bsd.own.mk>
+
+PROG= t_hid
.PATH: ${.CURDIR}/..
@@ -10,8 +12,6 @@ CPPFLAGS.t_hid.c= -I${.CURDIR}/../../../
CPPFLAGS.t_hid.c+= -I${.CURDIR}/../../../../sys/dev/usb
CPPFLAGS.t_hid.c+= -D_RUMPKERNEL
-.include <bsd.own.mk>
-
BINDIR= ${TESTSBASE}/dev/usb
LIBHIDDIR!= cd ${.CURDIR}/../libhid && ${PRINTOBJDIR}
@@ -20,10 +20,6 @@ LDADD+= -Wl,--whole-archive -lrumpdev_hi
DPADD+= ${LIBHIDDIR}/librumpdev_hid.a
DPADD+= ${ATF_C}
-LDADD+= -latf-c
-LDADD+= -lrump
-LDADD+= -lrumpuser
-LDADD+= -lrumpvfs
-LDADD+= -lpthread
+LDADD+= -latf-c ${LIBRUMPBASE}
.include <bsd.prog.mk>
Index: src/tests/fs/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.19 src/tests/fs/ffs/Makefile:1.20
--- src/tests/fs/ffs/Makefile:1.19 Wed Mar 22 17:33:06 2017
+++ src/tests/fs/ffs/Makefile Sun Mar 1 13:08:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/03/22 21:33:06 jdolecek Exp $
+# $NetBSD: Makefile,v 1.20 2020/03/01 18:08:13 christos Exp $
#
.include <bsd.own.mk>
@@ -35,7 +35,6 @@ LDADD+=-lrumpdev_disk -lrumpdev # di
LDADD+=-lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet # fifos
VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
LDADD+=-L${VFSTESTDIR} -lvfstest
-LDADD+=-lrumpvfs -lrumpkern_sysproxy -lrump -lrumpuser # base
-LDADD+=-lpthread
+LDADD+=-lrumpkern_sysproxy ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/fs/hfs/Makefile
diff -u src/tests/fs/hfs/Makefile:1.1 src/tests/fs/hfs/Makefile:1.2
--- src/tests/fs/hfs/Makefile:1.1 Fri Feb 18 08:07:54 2011
+++ src/tests/fs/hfs/Makefile Sun Mar 1 13:08:13 2020
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2011/02/18 13:07:54 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2020/03/01 18:08:13 christos Exp $
#
+.include <bsd.own.mk>
+
TESTSDIR= ${TESTSBASE}/fs/hfs
TESTS_C= t_pathconvert
@@ -10,6 +12,6 @@ FILESDIR= ${TESTSDIR}
LDADD+= -lrumpfs_hfs # fs drivers
LDADD+= -lrumpdev_disk -lrumpdev # disk drivers
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+= ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/fs/kernfs/Makefile
diff -u src/tests/fs/kernfs/Makefile:1.4 src/tests/fs/kernfs/Makefile:1.5
--- src/tests/fs/kernfs/Makefile:1.4 Tue Jun 10 00:28:39 2014
+++ src/tests/fs/kernfs/Makefile Sun Mar 1 13:08:13 2020
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 18:08:13 christos Exp $
#
+.include <bsd.own.mk>
+
TESTSDIR= ${TESTSBASE}/fs/kernfs
WARNS= 4
TESTS_C= t_basic
-.include <bsd.own.mk>
LDADD+= -lrumpfs_kernfs # fs driver
-LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
+LDADD+= ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/fs/lfs/Makefile
diff -u src/tests/fs/lfs/Makefile:1.1 src/tests/fs/lfs/Makefile:1.2
--- src/tests/fs/lfs/Makefile:1.1 Mon Jun 28 05:45:06 2010
+++ src/tests/fs/lfs/Makefile Sun Mar 1 13:08:13 2020
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2010/06/28 09:45:06 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2020/03/01 18:08:13 christos Exp $
#
+.include <bsd.own.mk>
+
TESTSDIR= ${TESTSBASE}/fs/lfs
WARNS= 4
@@ -8,6 +10,6 @@ TESTS_C= t_pr
LDADD+=-lrumpfs_lfs -lrumpfs_ffs # fs drivers
LDADD+=-lrumpdev_disk -lrumpdev # disk device
-LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+=${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/fs/msdosfs/Makefile
diff -u src/tests/fs/msdosfs/Makefile:1.2 src/tests/fs/msdosfs/Makefile:1.3
--- src/tests/fs/msdosfs/Makefile:1.2 Wed Jan 7 18:12:31 2015
+++ src/tests/fs/msdosfs/Makefile Sun Mar 1 13:08:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/01/07 23:12:31 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/01 18:08:13 christos Exp $
#
TESTSDIR= ${TESTSBASE}/fs/msdosfs
@@ -9,7 +9,7 @@ TESTS_C= t_snapshot
LDADD+=-lrumpfs_msdos -lrumpfs_tmpfs # fs drivers
LDADD+=-lrumpdev_fss # snapshot dev
LDADD+=-lrumpdev_disk -lrumpdev # disk device
-LDADD+=-lrumpvfs -lrumpkern_sysproxy -lrump -lrumpuser # base
+LDADD+=-lrumpkern_sysproxy ${LIBRUMPBASE}
LDADD+=-lpthread
.include <bsd.test.mk>
Index: src/tests/fs/nfs/Makefile
diff -u src/tests/fs/nfs/Makefile:1.10 src/tests/fs/nfs/Makefile:1.11
--- src/tests/fs/nfs/Makefile:1.10 Wed Jan 7 22:50:56 2015
+++ src/tests/fs/nfs/Makefile Sun Mar 1 13:08:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/01/08 03:50:56 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2020/03/01 18:08:14 christos Exp $
#
.include <bsd.own.mk>
@@ -18,13 +18,11 @@ VFSTESTDIR != cd ${.CURDIR}/../common &&
LDADD+=-L${VFSTESTDIR} -lvfstest
LDADD+=-lrumpfs_nfs # NFS
-LDADD+=-lrumpfs_ffs -lrumpvfs # ffs
+LDADD+=-lrumpfs_ffs # ffs
LDADD+=-lrumpdev_disk -lrumpdev # disk device
LDADD+=-lrumpnet_shmif # shmif
LDADD+=-lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=-lrumpkern_sysproxy -lrump -lrumpuser # base
-LDADD+=-lpthread
-
+LDADD+=-lrumpkern_sysproxy ${LIBRUMPBASE} # base
LDADD+=-lutil
.include <bsd.test.mk>
Index: src/tests/fs/nfs/nfsservice/Makefile
diff -u src/tests/fs/nfs/nfsservice/Makefile:1.14 src/tests/fs/nfs/nfsservice/Makefile:1.15
--- src/tests/fs/nfs/nfsservice/Makefile:1.14 Sun Oct 13 03:28:14 2019
+++ src/tests/fs/nfs/nfsservice/Makefile Sun Mar 1 13:08:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/10/13 07:28:14 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2020/03/01 18:08:14 christos Exp $
#
NOMAN= 1
@@ -22,10 +22,10 @@ LDADD+= -lrumpnet -lrumpnet_net -lrumpne
LDADD+= -lrumpnet_netinet6 -lrumpnet_netinet # TCP/IP
LDADD+= -lrumpfs_nfsserver -lrumpfs_nfs # NFS support
LDADD+= -lrumpdev_disk -lrumpdev # disk devices
-LDADD+= -lrumpfs_ffs -lrumpvfs # FFS
+LDADD+= -lrumpfs_ffs # FFS
LDADD+= -lrumpnet_shmif # shmif
-LDADD+= -lrumpnet -lrumpkern_sysproxy -lrump -lrumpuser # base
-LDADD+= -lpthread -lutil
+LDADD+= -lrumpnet -lrumpkern_sysproxy ${LIBRUMPBASE} # base
+LDADD+= -lutil
CPPFLAGS+= -DDEBUG -DMOUNT_NOMAIN -D_REENTRANT
CPPFLAGS+= -DRUMP_SYS_NETWORKING -DMOUNTD_RUMP -DNFSD_RUMP
Index: src/tests/fs/nullfs/Makefile
diff -u src/tests/fs/nullfs/Makefile:1.4 src/tests/fs/nullfs/Makefile:1.5
--- src/tests/fs/nullfs/Makefile:1.4 Tue Jun 10 00:28:39 2014
+++ src/tests/fs/nullfs/Makefile Sun Mar 1 13:08:14 2020
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 18:08:14 christos Exp $
#
+.include <bsd.own.mk>
+
TESTSDIR= ${TESTSBASE}/fs/nullfs
WARNS= 4
TESTS_C= t_basic
LDADD+= -lrumpfs_tmpfs -lrumpfs_null -lrumpvfs_layerfs # fs drivers
-LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
+LDADD+= ${LIBRUMPBASE} # base
.include <bsd.test.mk>
Index: src/tests/fs/ptyfs/Makefile
diff -u src/tests/fs/ptyfs/Makefile:1.5 src/tests/fs/ptyfs/Makefile:1.6
--- src/tests/fs/ptyfs/Makefile:1.5 Tue Jun 10 00:28:39 2014
+++ src/tests/fs/ptyfs/Makefile Sun Mar 1 13:08:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.6 2020/03/01 18:08:14 christos 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 -lrump -lpthread # base
+LDADD+= ${LIBRUMPBASE} # base
LDADD.t_nullpts+= -lrumpfs_null -lrumpvfs_layerfs
Index: src/tests/fs/puffs/Makefile
diff -u src/tests/fs/puffs/Makefile:1.14 src/tests/fs/puffs/Makefile:1.15
--- src/tests/fs/puffs/Makefile:1.14 Tue Jun 10 00:28:39 2014
+++ src/tests/fs/puffs/Makefile Sun Mar 1 13:08:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.15 2020/03/01 18:08:14 christos Exp $
#
.include <bsd.own.mk>
@@ -17,8 +17,7 @@ LDADD+=-L${VFSTESTDIR} -lvfstest
LDADD+= -lrumpdev_putter -lrumpdev
LDADD+= -lrumpfs_syspuffs -lrumpvfs_fifofs
LDADD+= -lrumpnet_local -lrumpnet_net -lrumpnet
-LDADD+= -lrumpvfs
-LDADD+= -lrump -lrumpuser -lrump -lpthread
+LDADD+= ${LIBRUMPBASE}
# required by -DPUFFSDUMP
#LDADD+= -lpuffs -lutil
Index: src/tests/fs/tmpfs/Makefile
diff -u src/tests/fs/tmpfs/Makefile:1.6 src/tests/fs/tmpfs/Makefile:1.7
--- src/tests/fs/tmpfs/Makefile:1.6 Sun Jun 6 23:43:51 2010
+++ src/tests/fs/tmpfs/Makefile Sun Mar 1 13:08:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/06/07 03:43:51 riz Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/01 18:08:14 christos Exp $
TESTSDIR= ${TESTSBASE}/fs/tmpfs
WARNS= 4
@@ -30,7 +30,7 @@ TESTS_SH+= t_vnode_leak
TESTS_C+= t_renamerace
-LDADD.t_renamerace+= -lrumpfs_tmpfs -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_renamerace+= -lrumpfs_tmpfs ${LIBRUMPBASE}
FILES= h_funcs.subr
FILESDIR= ${TESTSDIR}
Index: src/tests/fs/umapfs/Makefile
diff -u src/tests/fs/umapfs/Makefile:1.4 src/tests/fs/umapfs/Makefile:1.5
--- src/tests/fs/umapfs/Makefile:1.4 Tue Jun 10 00:28:39 2014
+++ src/tests/fs/umapfs/Makefile Sun Mar 1 13:08:14 2020
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 18:08:14 christos Exp $
#
+.include <bsd.own.mk>
+
TESTSDIR= ${TESTSBASE}/fs/umapfs
WARNS= 4
TESTS_C= t_basic
LDADD+= -lrumpfs_tmpfs -lrumpfs_umap -lrumpvfs_layerfs # fs drivers
-LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
+LDADD+= ${LIBRUMPBASE} # base
.include <bsd.test.mk>
Index: src/tests/fs/union/Makefile
diff -u src/tests/fs/union/Makefile:1.4 src/tests/fs/union/Makefile:1.5
--- src/tests/fs/union/Makefile:1.4 Tue Jun 10 00:28:39 2014
+++ src/tests/fs/union/Makefile Sun Mar 1 13:08:14 2020
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 18:08:14 christos Exp $
#
+.include <bsd.own.mk>
+
TESTSDIR= ${TESTSBASE}/fs/union
WARNS= 4
@@ -8,6 +10,6 @@ TESTS_C= t_pr
LDADD+= -lrumpfs_union -lrumpvfs_layerfs -lrumpfs_ffs # fs drivers
LDADD+= -lrumpdev_disk -lrumpdev # disk device
-LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
+LDADD+= ${LIBRUMPBASE} # base
.include <bsd.test.mk>
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.25 src/tests/fs/vfs/Makefile:1.26
--- src/tests/fs/vfs/Makefile:1.25 Sun Nov 19 16:05:26 2017
+++ src/tests/fs/vfs/Makefile Sun Mar 1 13:08:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/11/19 21:05:26 martin Exp $
+# $NetBSD: Makefile,v 1.26 2020/03/01 18:08:14 christos Exp $
#
.include <bsd.own.mk>
@@ -39,9 +39,8 @@ LDADD+=-lrumpfs_null -lrumpvfs_layerfs
VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
LDADD+=-L${VFSTESTDIR} -lvfstest
-LDADD+=-lrumpvfs -lrumpkern_sysproxy -lrump -lrumpuser # base
+LDADD+= ${LIBRUMPBASE} # base
LDADD+=-lrumpnet # static linking
-LDADD+=-lpthread
LDADD+=-lutil
Index: src/tests/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.14 src/tests/include/sys/Makefile:1.15
--- src/tests/include/sys/Makefile:1.14 Mon May 13 13:55:08 2019
+++ src/tests/include/sys/Makefile Sun Mar 1 13:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/05/13 17:55:08 bad Exp $
+# $NetBSD: Makefile,v 1.15 2020/03/01 18:08:15 christos Exp $
NOMAN= # defined
@@ -21,7 +21,7 @@ LDADD.t_bitops+= -lm
TESTS_C+= t_socket
CPPFLAGS.t_socket.c+= -D_KERNTYPES
LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet
-LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_socket+= ${LIBRUMPBASE}
.endif
.include <bsd.test.mk>
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.65 src/tests/kernel/Makefile:1.66
--- src/tests/kernel/Makefile:1.65 Mon Feb 10 22:15:10 2020
+++ src/tests/kernel/Makefile Sun Mar 1 13:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2020/02/11 03:15:10 riastradh Exp $
+# $NetBSD: Makefile,v 1.66 2020/03/01 18:08:15 christos Exp $
NOMAN= # defined
@@ -51,11 +51,9 @@ TESTS_SUBDIRS+= tty
TESTS_C+= t_extattrctl
TESTS_C+= t_filedesc
TESTS_C+= t_rnd
-LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser
-LDADD.t_extattrctl+= -lrump -lpthread
+LDADD.t_extattrctl+= ${LIBRUMPBASE}
LDADD.t_filedesc+= ${LDADD.t_rnd}
-LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser
-LDADD.t_rnd+= -lrump -lpthread
+LDADD.t_rnd+= -lrumpdev_rnd -lrumpdev ${LIBRUMPBASE}
.endif
Index: src/tests/kernel/tty/Makefile
diff -u src/tests/kernel/tty/Makefile:1.3 src/tests/kernel/tty/Makefile:1.4
--- src/tests/kernel/tty/Makefile:1.3 Sat Jan 23 16:22:49 2016
+++ src/tests/kernel/tty/Makefile Sun Mar 1 13:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:49 christos Exp $
+# $NetBSD: Makefile,v 1.4 2020/03/01 18:08:15 christos Exp $
.include <bsd.own.mk>
@@ -7,8 +7,6 @@ TESTSDIR= ${TESTSBASE}/kernel/tty
TESTS_C= t_pr
CPPFLAGS+= -D_KERNTYPES
-LDADD+= -lrumpkern_tty -lrumpvfs -lrump -lrumpuser
-LDADD+= -lrump
-LDADD+= -lpthread
+LDADD+= -lrumpkern_tty ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.58 src/tests/lib/libc/sys/Makefile:1.59
--- src/tests/lib/libc/sys/Makefile:1.58 Sat Feb 22 14:44:07 2020
+++ src/tests/lib/libc/sys/Makefile Sun Mar 1 13:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2020/02/22 19:44:07 kamil Exp $
+# $NetBSD: Makefile,v 1.59 2020/03/01 18:08:15 christos Exp $
MKMAN= no
@@ -98,7 +98,7 @@ LDADD.t_ptrace_waitpid+= -pthread -lm -l
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
CPPFLAGS.t_posix_fadvise.c += -D_KERNTYPES
TESTS_C+= t_posix_fadvise
-LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
+LDADD.t_posix_fadvise+= ${RUMPVFSLIB}
.endif
CPPFLAGS.t_lwp_create.c += -D_KERNTYPES
Index: src/tests/lib/semaphore/pthread/Makefile
diff -u src/tests/lib/semaphore/pthread/Makefile:1.5 src/tests/lib/semaphore/pthread/Makefile:1.6
--- src/tests/lib/semaphore/pthread/Makefile:1.5 Sat Jun 1 02:59:17 2019
+++ src/tests/lib/semaphore/pthread/Makefile Sun Mar 1 13:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/06/01 06:59:17 kre Exp $
+# $NetBSD: Makefile,v 1.6 2020/03/01 18:08:15 christos Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ TESTS_C= t_sem_pth
CPPFLAGS+= -I${.CURDIR}/.. -D_KERNTYPES
-LDADD+= -lrump -lrumpuser -lrump -lrumpvfs -lpthread
+LDADD+= ${LIBRUMPBASE}
WARNS= 4
Index: src/tests/modules/Makefile
diff -u src/tests/modules/Makefile:1.17 src/tests/modules/Makefile:1.18
--- src/tests/modules/Makefile:1.17 Mon Apr 15 19:41:23 2019
+++ src/tests/modules/Makefile Sun Mar 1 13:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/04/15 23:41:23 christos Exp $
+# $NetBSD: Makefile,v 1.18 2020/03/01 18:08:15 christos Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@ TESTS_C+= t_ufetchstore
CPPFLAGS.t_ufetchstore.c+=-I${.CURDIR}/ufetchstore
.for i in t_modctl t_builtin t_kcov
LDADD.${i}= -lprop
-LDADD.${i}+= -lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lrump -lpthread
+LDADD.${i}+= -lrumpfs_kernfs ${LIBRUMPBASE}
.endfor
TESTS_SH= t_abi_uvm
Index: src/tests/net/bpf/Makefile
diff -u src/tests/net/bpf/Makefile:1.5 src/tests/net/bpf/Makefile:1.6
--- src/tests/net/bpf/Makefile:1.5 Mon Jul 7 15:41:22 2014
+++ src/tests/net/bpf/Makefile Sun Mar 1 13:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/07/07 19:41:22 alnsn Exp $
+# $NetBSD: Makefile,v 1.6 2020/03/01 18:08:15 christos Exp $
#
.include <bsd.own.mk>
@@ -11,6 +11,6 @@ TESTS_C+= t_mbuf
LDADD+= -lrumpnet_shmif
LDADD+= -lrumpdev_bpf -lrumpdev -lrumpnet_netinet -lrumpnet_net
-LDADD+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lrump -lpthread
+LDADD+= -lrumpnet ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/net/bpfilter/Makefile
diff -u src/tests/net/bpfilter/Makefile:1.2 src/tests/net/bpfilter/Makefile:1.3
--- src/tests/net/bpfilter/Makefile:1.2 Tue Jun 10 00:28:40 2014
+++ src/tests/net/bpfilter/Makefile Sun Mar 1 13:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:40 he Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/01 18:08:15 christos 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 -lrump -lpthread
+LDADD+= -lrumpnet ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/net/bpfjit/Makefile
diff -u src/tests/net/bpfjit/Makefile:1.8 src/tests/net/bpfjit/Makefile:1.9
--- src/tests/net/bpfjit/Makefile:1.8 Sat Jun 1 02:59:17 2019
+++ src/tests/net/bpfjit/Makefile Sun Mar 1 13:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/06/01 06:59:17 kre Exp $
+# $NetBSD: Makefile,v 1.9 2020/03/01 18:08:15 christos Exp $
#
.include <bsd.own.mk>
@@ -14,6 +14,6 @@ PAXCTL_FLAGS= +m
LDADD+= -lrumpnet_bpfjit -lrumpkern_sljit
LDADD+= -lrumpdev_bpf -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpvfs -lrumpuser -lpthread
+LDADD+= ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/net/can/Makefile
diff -u src/tests/net/can/Makefile:1.2 src/tests/net/can/Makefile:1.3
--- src/tests/net/can/Makefile:1.2 Sat May 27 17:02:56 2017
+++ src/tests/net/can/Makefile Sun Mar 1 13:08:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/05/27 21:02:56 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/01 18:08:16 christos Exp $
#
.include <bsd.own.mk>
@@ -16,6 +16,6 @@ SRCS.t_canfilter= t_canfilter.c h_canuti
# which is NULL if rumpnet_netinet is not inclued.
#
LDADD+= -lrumpnet_netcan -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpuser -lrump -lpthread -lrumpdev -lrumpvfs
+LDADD+= ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/net/icmp/Makefile
diff -u src/tests/net/icmp/Makefile:1.11 src/tests/net/icmp/Makefile:1.12
--- src/tests/net/icmp/Makefile:1.11 Sat Jun 1 02:59:17 2019
+++ src/tests/net/icmp/Makefile Sun Mar 1 13:08:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/06/01 06:59:17 kre Exp $
+# $NetBSD: Makefile,v 1.12 2020/03/01 18:08:16 christos Exp $
#
.include <bsd.own.mk>
@@ -14,6 +14,6 @@ TESTS_SH_SRC_t_${name}= ../net_common.sh
.endfor
LDADD+= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpvfs -lrumpuser -lrump -lpthread
+LDADD+= ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/net/if/Makefile
diff -u src/tests/net/if/Makefile:1.9 src/tests/net/if/Makefile:1.10
--- src/tests/net/if/Makefile:1.9 Sat Jun 1 02:59:17 2019
+++ src/tests/net/if/Makefile Sun Mar 1 13:08:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/06/01 06:59:17 kre Exp $
+# $NetBSD: Makefile,v 1.10 2020/03/01 18:08:16 christos Exp $
#
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ PROGS= ifconf
MAN.ifconf= # empty
BINDIR.ifconf= ${TESTSDIR}
-LDADD.t_compat= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump
-LDADD.t_compat+= -lrumpuser -lrump -lrumpvfs -lpthread
+LDADD.t_compat= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
+LDADD.t_compat+= ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/net/if_loop/Makefile
diff -u src/tests/net/if_loop/Makefile:1.6 src/tests/net/if_loop/Makefile:1.7
--- src/tests/net/if_loop/Makefile:1.6 Sat Jun 1 02:59:17 2019
+++ src/tests/net/if_loop/Makefile Sun Mar 1 13:08:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/06/01 06:59:17 kre Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/01 18:08:16 christos Exp $
#
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ TESTSDIR= ${TESTSBASE}/net/if_loop
TESTS_C= t_pr
LDADD+= -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpvfs -lrumpuser -lrump -lpthread
+LDADD+= ${LIBRUMPBASE}
.for name in basic
TESTS_SH+= t_${name}
Index: src/tests/net/net/Makefile
diff -u src/tests/net/net/Makefile:1.22 src/tests/net/net/Makefile:1.23
--- src/tests/net/net/Makefile:1.22 Mon May 13 13:55:09 2019
+++ src/tests/net/net/Makefile Sun Mar 1 13:08:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/05/13 17:55:09 bad Exp $
+# $NetBSD: Makefile,v 1.23 2020/03/01 18:08:16 christos Exp $
#
.include <bsd.own.mk>
@@ -22,8 +22,8 @@ TESTS_SH_SRC_t_${name}= ../net_common.sh
LDADD.t_pktinfo_send+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net
LDADD.t_pktinfo_send+= -lrumpnet_shmif -lrumpnet
-LDADD.t_pktinfo_send+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
+LDADD.t_pktinfo_send+= ${LIBRUMPBASE}
LDADD.t_raw+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net
-LDADD.t_raw+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lrump -lpthread
+LDADD.t_raw+= -lrumpnet ${LIBRUMPBASE}
.include <bsd.test.mk>
Index: src/tests/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.18 src/tests/rump/rumpkern/Makefile:1.19
--- src/tests/rump/rumpkern/Makefile:1.18 Wed Dec 26 09:27:23 2018
+++ src/tests/rump/rumpkern/Makefile Sun Mar 1 13:08:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/12/26 14:27:23 thorpej Exp $
+# $NetBSD: Makefile,v 1.19 2020/03/01 18:08:16 christos Exp $
.include <bsd.own.mk>
@@ -20,10 +20,9 @@ TESTS_SH= t_sp
SUBDIR+= h_client h_server
-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}
+LDADD.t_modlinkset+= -lrumpfs_cd9660 ${LIBRUMPBASE}
+LDADD+= ${LIBRUMPBASE}
KERNSPACE != cd ${.CURDIR}/../kernspace && ${PRINTOBJDIR}
LDADD+= -L${KERNSPACE} -lkernspace -lrump
Index: src/tests/rump/rumpkern/h_server/Makefile
diff -u src/tests/rump/rumpkern/h_server/Makefile:1.6 src/tests/rump/rumpkern/h_server/Makefile:1.7
--- src/tests/rump/rumpkern/h_server/Makefile:1.6 Sat Jun 1 02:59:17 2019
+++ src/tests/rump/rumpkern/h_server/Makefile Sun Mar 1 13:08:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/06/01 06:59:17 kre Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/01 18:08:16 christos Exp $
#
.include <bsd.own.mk>
@@ -9,7 +9,7 @@ TESTS_C= h_simpleserver
ATFFILE= no
-LDADD+= -lrumpkern_sysproxy -lrump -lrumpuser -lrump -lrumpvfs -lpthread
+LDADD+= -lrumpkern_sysproxy ${LIBRUMPBASE}
WARNS= 4
NOMAN=
Index: src/tests/rump/rumpvfs/Makefile
diff -u src/tests/rump/rumpvfs/Makefile:1.4 src/tests/rump/rumpvfs/Makefile:1.5
--- src/tests/rump/rumpvfs/Makefile:1.4 Tue Jun 10 00:28:40 2014
+++ src/tests/rump/rumpvfs/Makefile Sun Mar 1 13:08:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:40 he Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 18:08:16 christos 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 -lrump -lpthread
+LDADD= ${LIBRUMPBASE}
WARNS= 4
