Module Name: src
Committed By: jakllsch
Date: Fri Jan 8 17:27:48 UTC 2016
Modified Files:
src/tests/dev/usb: Makefile
Added Files:
src/tests/dev/usb/t_hid: Makefile
Log Message:
rework build of t_hid to be more reliable, while working around ATF cruddyness
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/dev/usb/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/dev/usb/t_hid/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/usb/Makefile
diff -u src/tests/dev/usb/Makefile:1.2 src/tests/dev/usb/Makefile:1.3
--- src/tests/dev/usb/Makefile:1.2 Wed Jan 6 15:34:54 2016
+++ src/tests/dev/usb/Makefile Fri Jan 8 17:27:48 2016
@@ -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>
Added files:
Index: src/tests/dev/usb/t_hid/Makefile
diff -u /dev/null src/tests/dev/usb/t_hid/Makefile:1.1
--- /dev/null Fri Jan 8 17:27:48 2016
+++ src/tests/dev/usb/t_hid/Makefile Fri Jan 8 17:27:48 2016
@@ -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>
