From 7a8769b3afdb4c285f391cb02e13a57c8063d5e2 Mon Sep 17 00:00:00 2001
From: hselasky <hselasky@FreeBSD.org>
Date: Wed, 7 Feb 2018 19:20:59 +0000
Subject: [PATCH] Move the stand/usb test loader into its own directory. Fix
 its Makefile to build correctly.

MFC after:	1 week
Sponsored by:	Mellanox Technologies
---
 stand/usb/{Makefile.test => test/Makefile} | 14 +++++++++-----
 stand/usb/{ => test}/bsd_usbloader_test.c  |  0
 2 files changed, 9 insertions(+), 5 deletions(-)
 rename stand/usb/{Makefile.test => test/Makefile} (91%)
 rename stand/usb/{ => test}/bsd_usbloader_test.c (100%)

diff --git a/stand/usb/Makefile.test b/stand/usb/test/Makefile
similarity index 91%
rename from stand/usb/Makefile.test
rename to stand/usb/test/Makefile
index 4d7a0733c224..c82b5bac3823 100644
--- a/stand/usb/Makefile.test
+++ b/stand/usb/test/Makefile
@@ -30,6 +30,7 @@
 #
 
 .PATH: ${.CURDIR}
+.SUFFIXES: .a
 
 PROG=	usbloader
 SRCS= 
@@ -45,12 +46,15 @@ LDFLAGS+= -Wl,--gc-sections
 
 SRCS+=	bsd_usbloader_test.c
 
-LDADD+=	libusbboot.a
-DPADD+= libusbboot.a
+USBLIB?= ${.OBJDIR}/../libusbboot.a
+
+LDADD+= ${USBLIB}
+DPADD+= ${USBLIB}
+
+MAN=
 
 .include <bsd.prog.mk>
 
-${PROG}: libusbboot.a
+${USBLIB}:
+	make -C ${.CURDIR}/.. USBCOREDIR=${.CURDIR}/..
 
-libusbboot.a:
-	make -f Makefile
diff --git a/stand/usb/bsd_usbloader_test.c b/stand/usb/test/bsd_usbloader_test.c
similarity index 100%
rename from stand/usb/bsd_usbloader_test.c
rename to stand/usb/test/bsd_usbloader_test.c