From: Nathan Hjelm <hjelmn@me.com>
Date: Sat, 27 Jul 2013 19:57:39 +0000 (-0600)
Subject: Silence automake 1.14 warning
X-Git-Tag: upstream/1.0.21~377
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=872ff1704b79034af14cd09ac335bd97fe9be1ea;p=platform%2Fupstream%2Flibusb.git

Silence automake 1.14 warning

The warning is:

libusb/Makefile.am:57: warning: source file 'os/threads_windows.c' is in a subdirectory,
libusb/Makefile.am:57: but option 'subdir-objects' is disabled
automake: warning: possible forward-incompatibility.
automake: At least a source file is in a subdirectory, but the 'subdir-objects'
automake: automake option hasn't been enabled.  For now, the corresponding output
automake: object file(s) will be placed in the top-level directory.  However,
automake: this behaviour will change in future Automake versions: they will
automake: unconditionally cause object files to be placed in the same subdirectory
automake: of the corresponding sources.
automake: You are advised to start using 'subdir-objects' option throughout your
automake: project, to avoid future incompatibilities.

Fixed by setting the subdir-objects option.

Closes #125.
---

diff --git a/libusb/Makefile.am b/libusb/Makefile.am
index 7f9c1f9..9779dbb 100644
--- a/libusb/Makefile.am
+++ b/libusb/Makefile.am
@@ -1,5 +1,7 @@
 all: libusb-1.0.la libusb-1.0.dll
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 lib_LTLIBRARIES = libusb-1.0.la
 
 POSIX_POLL_SRC = os/poll_posix.c
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 34e26ff..39ad7e3 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10777
+#define LIBUSB_NANO 10778