summaryrefslogtreecommitdiff
path: root/tests/dev
diff options
context:
space:
mode:
authorjakllsch <jakllsch@NetBSD.org>2016-01-08 17:27:48 +0000
committerjakllsch <jakllsch@NetBSD.org>2016-01-08 17:27:48 +0000
commit022fe8ea9c91611a5880d89d91c95790d930e666 (patch)
tree0b41af473c9f47fcad0416d4412e9455846c8892 /tests/dev
parente9070fd8ab0b1203dd1d755304d626fd32257826 (diff)
rework build of t_hid to be more reliable, while working around ATF cruddyness
Diffstat (limited to 'tests/dev')
-rw-r--r--tests/dev/usb/Makefile18
-rw-r--r--tests/dev/usb/t_hid/Makefile26
2 files changed, 30 insertions, 14 deletions
diff --git a/tests/dev/usb/Makefile b/tests/dev/usb/Makefile
index 336f20dee11..3d875f0e572 100644
--- a/tests/dev/usb/Makefile
+++ b/tests/dev/usb/Makefile
@@ -1,22 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2016/01/06 15:34:54 christos Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/08 17:27:48 jakllsch Exp $
#
.include <bsd.own.mk>
-TESTSDIR= ${TESTSBASE}/dev/usb
-
-TESTS_C= t_hid
+SUBDIR= libhid .WAIT
-CPPFLAGS.t_hid.c= -I${.CURDIR}/../../../sys/dev/usb
-
-SUBDIR= libhid
-LIBHIDDIR!= cd ${.CURDIR}/libhid && ${PRINTOBJDIR}
-LDFLAGS+= -L${LIBHIDDIR}
-LDADD+= -Wl,--whole-archive -lrumpdev_hid -Wl,--no-whole-archive
+TESTSDIR= ${TESTSBASE}/dev/usb
-LDADD+= -lrump
-LDADD+= -lrumpuser
-LDADD+= -lrump
-LDADD+= -lpthread
+TESTS_SUBDIRS= t_hid
.include <bsd.test.mk>
diff --git a/tests/dev/usb/t_hid/Makefile b/tests/dev/usb/t_hid/Makefile
new file mode 100644
index 00000000000..89037bb4559
--- /dev/null
+++ b/tests/dev/usb/t_hid/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2016/01/08 17:27:48 jakllsch Exp $
+#
+
+PROG= t_hid
+NOMAN=
+
+.PATH: ${.CURDIR}/..
+
+CPPFLAGS.t_hid.c= -I${.CURDIR}/../../../../sys/dev/usb
+
+.include <bsd.own.mk>
+
+BINDIR= ${TESTSBASE}/dev/usb
+
+LIBHIDDIR!= cd ${.CURDIR}/../libhid && ${PRINTOBJDIR}
+LDFLAGS+= -L${LIBHIDDIR}
+LDADD+= -Wl,--whole-archive -lrumpdev_hid -Wl,--no-whole-archive
+DPADD+= ${LIBHIDDIR}/librumpdev_hid.a
+DPADD+= ${ATF_C}
+
+LDADD+= -latf-c
+LDADD+= -lrump
+LDADD+= -lrumpuser
+LDADD+= -lpthread
+
+.include <bsd.prog.mk>