summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxantares <xantares09@hotmail.com>2014-01-24 09:07:11 +0000
committerPete Batard <pete@akeo.ie>2014-01-25 22:42:31 +0000
commitf6c935902a6b04f05d4dd189e9866de9eafb19c3 (patch)
treed96632e7fcd46fb7b2f3a22fd269ab42abe48d49
parent28c37da1f4cc2b9e683c8531d2f6c90559708948 (diff)
downloadlibusb-f6c935902a6b04f05d4dd189e9866de9eafb19c3.tar.gz
Windows: Fix MinGW parallel build
-rw-r--r--libusb/Makefile.am2
-rw-r--r--libusb/version_nano.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libusb/Makefile.am b/libusb/Makefile.am
index 587661a..80e3705 100644
--- a/libusb/Makefile.am
+++ b/libusb/Makefile.am
@@ -52,7 +52,7 @@ OS_SRC = $(WINDOWS_USB_SRC)
libusb-1.0.rc: version.h version_nano.h
endif
-libusb-1.0.dll: libusb-1.0.def
+libusb-1.0.dll: libusb-1.0.def libusb-1.0.la
if CREATE_IMPORT_LIB
# Rebuild the import lib from the .def so that MS and MinGW DLLs can be interchanged
$(AM_V_GEN)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname $@ --output-lib .libs/$@.a
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index b7dfab5..caddced 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10864
+#define LIBUSB_NANO 10865