diff options
author | Xiaofan Chen <xiaofanc@gmail.com> | 2012-01-13 13:04:00 +0100 |
---|---|---|
committer | Peter Stuge <peter@stuge.se> | 2012-01-13 18:04:39 +0100 |
commit | 93b0e09d53ed1d177631af9182378492481a790a (patch) | |
tree | 02b70e8e42b117f65005050a6c39deda1c21f860 | |
parent | cdc5df8f1b206a7c19bc221e8a9a97d5d98deb85 (diff) | |
download | libusb-93b0e09d53ed1d177631af9182378492481a790a.tar.gz |
examples: Link only with ../libusb/libusb-1.0.la and not with -lusb-1.0
Previous _LDFLAGS included both the freshly built libusb in ../libusb
and -lusb-1.0, where libtool would usually resolve the latter to an
already-installed libusb library in the system. The extra reference
to a second libusb library resulted in failure to build examples on
Mac OS X in some cases, and is plain wrong.
See also the thread at http://marc.info/?m=132637593623667
-rw-r--r-- | examples/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 846af15..0a62aea 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -2,11 +2,11 @@ INCLUDES = -I$(top_srcdir)/libusb noinst_PROGRAMS = lsusb lsusb_SOURCES = lsusb.c -lsusb_LDADD = ../libusb/libusb-1.0.la -lusb-1.0 +lsusb_LDADD = ../libusb/libusb-1.0.la if HAVE_SIGACTION dpfp_SOURCES = dpfp.c -dpfp_LDADD = ../libusb/libusb-1.0.la -lusb-1.0 +dpfp_LDADD = ../libusb/libusb-1.0.la noinst_PROGRAMS += dpfp endif @@ -14,7 +14,7 @@ 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 -lusb-1.0 +dpfp_threaded_LDADD = ../libusb/libusb-1.0.la noinst_PROGRAMS += dpfp_threaded endif endif |