diff options
| author | Pete Batard <pete@akeo.ie> | 2012-06-11 14:12:56 +0100 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2012-06-11 14:26:51 +0100 |
| commit | beeb662e7c76560a7a305417c3cf09e1dafc1bdb (patch) | |
| tree | 3d5f104b5219b1a9a69db082e670502bad2f9f5d | |
| parent | 6b33cd458921a6023e6e54f3715ead7ed441c648 (diff) | |
Autotools: add libusb-1.0.def and libusb_nano.h as dependencies
* Also add version_nano.h to EXTRA_DIST as it is not added to the
dist archive by default
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | libusb/Makefile.am | 4 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 4f9ae65..c71c5c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip ACLOCAL_AMFLAGS = -I m4 DISTCLEANFILES = libusb-1.0.pc -EXTRA_DIST = TODO PORTING msvc libusb/libusb-1.0.def +EXTRA_DIST = TODO PORTING msvc libusb/libusb-1.0.def libusb/version_nano.h SUBDIRS = libusb doc if BUILD_EXAMPLES diff --git a/libusb/Makefile.am b/libusb/Makefile.am index 4a6859e..44d3efe 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -29,10 +29,10 @@ OS_SRC = $(WINDOWS_USB_SRC) .rc.lo: $(AM_V_GEN)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) -i $< -o $@ -libusb-1.0.rc: version.h +libusb-1.0.rc: version.h version_nano.h endif -libusb-1.0.dll: +libusb-1.0.dll: libusb-1.0.def 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 2e047f4..cd5ff62 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10526 +#define LIBUSB_NANO 10527 |