[src/trunk]: src/tests/dev/usb rework build of t_hid to be more reliable, whi...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c51f5fe3ebe6
branches:  trunk
changeset: 342779:c51f5fe3ebe6
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Jan 08 17:27:48 2016 +0000

description:
rework build of t_hid to be more reliable, while working around ATF cruddyness

diffstat:

 tests/dev/usb/Makefile       |  18 ++++--------------
 tests/dev/usb/t_hid/Makefile |  26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 14 deletions(-)

diffs (60 lines):

diff -r 0763dd86e5ea -r c51f5fe3ebe6 tests/dev/usb/Makefile
--- a/tests/dev/usb/Makefile    Fri Jan 08 08:57:14 2016 +0000
+++ b/tests/dev/usb/Makefile    Fri Jan 08 17:27:48 2016 +0000
@@ -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>
 
+SUBDIR= libhid .WAIT
+
 TESTSDIR=      ${TESTSBASE}/dev/usb
 
-TESTS_C=       t_hid
-
-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
-
-LDADD+= -lrump
-LDADD+= -lrumpuser
-LDADD+= -lrump
-LDADD+= -lpthread
+TESTS_SUBDIRS= t_hid
 
 .include <bsd.test.mk>
diff -r 0763dd86e5ea -r c51f5fe3ebe6 tests/dev/usb/t_hid/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/dev/usb/t_hid/Makefile      Fri Jan 08 17:27:48 2016 +0000
@@ -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>