diff options
| author | Chris Johns <chrisj@rtems.org> | 2011-02-24 19:51:16 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2011-02-24 19:51:16 +0000 |
| commit | 6356d874dba955df7b1ca7cf9c255d3875aaf76a (patch) | |
| tree | f0247fcc23aa27ddcc60053d83748a3dfa49f1d4 | |
| parent | fdd50d75564ca99d1e6acfbd223d1493713bba2b (diff) | |
| download | libusb-pbr331.tar.gz | |
fix out of source build for DLL generationpbr331
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libusb/Makefile.am | 4 | ||||
| -rw-r--r-- | libusb/libusb_version.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 191b300..f173b9b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ m4_define(LIBUSB_MAJOR, [1]) m4_define(LIBUSB_MINOR, [0]) m4_define(LIBUSB_MICRO, [8]) -m4_define(LIBUSB_NANO, [10330]) +m4_define(LIBUSB_NANO, [10331]) AC_INIT([libusb], LIBUSB_MAJOR.LIBUSB_MINOR.LIBUSB_MICRO, [libusb-devel@lists.sourceforge.net], [libusb], [http://www.libusb.org/]) diff --git a/libusb/Makefile.am b/libusb/Makefile.am index 59eb5c4..b7890b1 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -1,7 +1,7 @@ all: libusb-1.0.la if CREATE_IMPORT_LIB # Rebuild the import lib from the .def so that MS and MinGW DLLs can be interchanged - $(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def libusb-1.0.def --dllname libusb-1.0.dll --output-lib .libs/libusb-1.0.dll.a + $(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname libusb-1.0.dll --output-lib .libs/libusb-1.0.dll.a endif lib_LTLIBRARIES = libusb-1.0.la @@ -30,7 +30,7 @@ OS_SRC += os/threads_windows.c endif .rc.lo: - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) -i $< -o $@ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) -I. -i $< -o $@ endif libusb_1_0_la_CFLAGS = $(VISIBILITY_CFLAGS) $(AM_CFLAGS) $(THREAD_CFLAGS) diff --git a/libusb/libusb_version.h b/libusb/libusb_version.h index edcf85b..ca02047 100644 --- a/libusb/libusb_version.h +++ b/libusb/libusb_version.h @@ -24,6 +24,6 @@ #define LIBUSB_VERSION_MAJOR 1 #define LIBUSB_VERSION_MINOR 0 #define LIBUSB_VERSION_MICRO 8 -#define LIBUSB_VERSION_NANO 10330 +#define LIBUSB_VERSION_NANO 10331 #endif |