From d0db4bfcec03de790d213da7c760bc452bb19d26 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Tue, 20 Jan 2015 18:29:31 +0300 Subject: [PATCH] Makefile.am: link libusb-1.0 after libusb-0.1 to fix dependencies Since libusb-0.1 might be provided by libusb-compat, it will depend on libusb-1.0, so needs to be mentioned before it in the link command line, this is relevant for static linking. Thanks go to mingwandroid for spotting it during MSYS2 build. Change-Id: I15cf0b8f084c351b4f93e75686bd0f843477352b Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/2485 Tested-by: jenkins Reviewed-by: Spencer Oliver --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7d67e3d7e9..26e02d0853 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -74,7 +74,7 @@ libopenocd_la_LIBADD = \ $(top_builddir)/src/rtos/librtos.la \ $(top_builddir)/src/helper/libhelper.la \ $(LIBFTDI_LIBS) $(MINGWLDADD) \ - $(HIDAPI_LIBS) $(LIBUSB1_LIBS) $(LIBUSB0_LIBS) + $(HIDAPI_LIBS) $(LIBUSB0_LIBS) $(LIBUSB1_LIBS) STARTUP_TCL_SRCS = \ $(srcdir)/helper/startup.tcl \ -- 2.30.2