diff options
| author | Ludovic Rousseau <ludovic.rousseau@gmail.com> | 2012-05-09 09:12:01 +0200 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2012-05-10 15:38:19 +0100 |
| commit | 6b7609125f02b18a3b57a2b101d1404aab8f181e (patch) | |
| tree | 590f831a78be7de06590f7d780d013f62d38fb3e | |
| parent | 207566535293136c89bc5b7df8c588418171e54f (diff) | |
Samples: Use a common LDADD for all examples
* Similar to libusb patch a129732fb45fc424743f26f01c906e4514f11521
| -rw-r--r-- | examples/Makefile.am | 6 | ||||
| -rw-r--r-- | libusb/version.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 3ff6cdc..ab4c4ce 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,15 +1,14 @@ INCLUDES = -I$(top_srcdir)/libusb +LDADD = ../libusb/libusb-1.0.la + noinst_PROGRAMS = listdevs xusb listdevs_SOURCES = listdevs.c -listdevs_LDADD = ../libusb/libusb-1.0.la xusb_SOURCES = xusb.c -xusb_LDADD = ../libusb/libusb-1.0.la if HAVE_SIGACTION dpfp_SOURCES = dpfp.c -dpfp_LDADD = ../libusb/libusb-1.0.la noinst_PROGRAMS += dpfp endif @@ -17,7 +16,6 @@ if THREADS_POSIX if HAVE_SIGACTION dpfp_threaded_SOURCES = dpfp_threaded.c dpfp_threaded_CFLAGS = $(THREAD_CFLAGS) $(AM_CFLAGS) -dpfp_threaded_LDADD = ../libusb/libusb-1.0.la noinst_PROGRAMS += dpfp_threaded endif endif diff --git a/libusb/version.h b/libusb/version.h index 0d262eb..c63bbf8 100644 --- a/libusb/version.h +++ b/libusb/version.h @@ -9,7 +9,7 @@ #define LIBUSB_MICRO 11 #endif #ifndef LIBUSB_NANO -#define LIBUSB_NANO 10500 +#define LIBUSB_NANO 10501 #endif /* LIBUSB_RC is the release candidate suffix. Should normally be empty. */ #ifndef LIBUSB_RC |