diff options
| author | Daniel Drake <dan@reactivated.net> | 2010-07-29 12:42:25 +0100 |
|---|---|---|
| committer | Daniel Drake <dan@reactivated.net> | 2010-07-29 12:42:25 +0100 |
| commit | 435760539ee5277bc31aa12fb6dbe685d055963b (patch) | |
| tree | e93e9a0d8fa32a801fafad351dfa077fc4d57467 /libusb | |
| parent | 1867c7103b51e21432a11df8893050a4fe60ba42 (diff) | |
| download | libusb-435760539ee5277bc31aa12fb6dbe685d055963b.tar.gz | |
bring autoconf/automake in line with official
Diffstat (limited to 'libusb')
| -rw-r--r-- | libusb/Makefile.am | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/libusb/Makefile.am b/libusb/Makefile.am index 24ab9dc..a71922f 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -1,16 +1,11 @@ lib_LTLIBRARIES = libusb-1.0.la -if POSIX_THREADS -THREADS_SRC = os/threads_posix.h -else -THREADS_SRC = os/threads_windows.h os/threads_windows.c -endif - -LINUX_USBFS_SRC = $(THREADS_SRC) os/poll_posix.h os/linux_usbfs.h os/linux_usbfs.c -DARWIN_USB_SRC = $(THREADS_SRC) os/poll_posix.h os/darwin_usb.h os/darwin_usb.c -WINDOWS_USB_SRC = $(THREADS_SRC) os/poll_windows.h os/poll_windows.c os/windows_usb.h os/windows_usb.c libusb-1.0.rc +LINUX_USBFS_SRC = os/linux_usbfs.c +DARWIN_USB_SRC = os/darwin_usb.c +WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc -EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(WINDOWS_USB_SRC) +EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(WINDOWS_USB_SRC) \ + os/threads_windows.c if OS_LINUX OS_SRC = $(LINUX_USBFS_SRC) @@ -23,12 +18,20 @@ endif if OS_WINDOWS OS_SRC = $(WINDOWS_USB_SRC) + +if !THREADS_POSIX +OS_SRC += os/threads_windows.c +endif + .rc.lo: $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) -i $< -o $@ endif -libusb_1_0_la_CFLAGS = $(VISIBILITY_CFLAGS) $(THREAD_CFLAGS) $(AM_CFLAGS) -libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) +libusb_1_0_la_CFLAGS = $(VISIBILITY_CFLAGS) $(AM_CFLAGS) $(THREAD_CFLAGS) +libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) \ + os/linux_usbfs.h os/darwin_usb.h os/windows_usb.h \ + os/threads_posix.h os/threads_windows.h \ + os/poll_posix.h os/poll_windows.h hdrdir = $(includedir)/libusb-1.0 -hdr_HEADERS = libusb.h +hdr_HEADERS = libusb.h
\ No newline at end of file |