diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2016-01-23 23:08:09 -0800 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2016-01-26 23:38:33 -0800 |
| commit | 48bfef6c1d1d2275dc1999a8b7b55954983d809c (patch) | |
| tree | 463892c72b2106ae461c9eca71433266e2a08c48 | |
| parent | 24c528934236fd167adc162695a5bdbd60bf7842 (diff) | |
| download | libusb-48bfef6c1d1d2275dc1999a8b7b55954983d809c.tar.gz | |
Misc: Minor makefile cleanup
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
| -rw-r--r-- | libusb/Makefile.am | 16 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/libusb/Makefile.am b/libusb/Makefile.am index 971c5b2..15042d3 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -12,12 +12,10 @@ LINUX_USBFS_SRC = os/linux_usbfs.h os/linux_usbfs.c DARWIN_USB_SRC = os/darwin_usb.h os/darwin_usb.c OPENBSD_USB_SRC = os/openbsd_usb.c NETBSD_USB_SRC = os/netbsd_usb.c -COMMON_WINDOWS_SRC = os/windows_nt_common.h \ - os/windows_nt_common.c \ - os/windows_common.h \ - libusb-1.0.rc libusb-1.0.def -WINDOWS_USB_SRC = os/windows_winusb.h os/windows_winusb.c $(COMMON_WINDOWS_SRC) -WINDOWS_USBDK_SRC = os/windows_usbdk.h os/windows_usbdk.c $(COMMON_WINDOWS_SRC) +WINDOWS_COMMON_SRC = os/windows_nt_common.h os/windows_nt_common.c \ + os/windows_common.h libusb-1.0.rc libusb-1.0.def +WINDOWS_USB_SRC = os/windows_winusb.h os/windows_winusb.c +WINDOWS_USBDK_SRC = os/windows_usbdk.h os/windows_usbdk.c WINCE_USB_SRC = os/wince_usb.h os/wince_usb.c HAIKU_USB_SRC = os/haiku_usb.h os/haiku_usb_backend.cpp \ os/haiku_usb_raw.h os/haiku_usb_raw.cpp os/haiku_pollfs.cpp @@ -26,7 +24,7 @@ EXTRA_DIST = $(POSIX_POLL_SRC) $(POSIX_THREADS_SRC) \ $(WINDOWS_POLL_SRC) $(WINDOWS_THREADS_SRC) \ $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) \ $(OPENBSD_USB_SRC) $(NETBSD_USB_SRC) \ - $(WINDOWS_USB_SRC) $(WINDOWS_USBDK_SRC) \ + $(WINDOWS_COMMON_SRC) $(WINDOWS_USB_SRC) $(WINDOWS_USBDK_SRC) \ $(WINCE_USB_SRC) $(HAIKU_USB_SRC) \ os/linux_udev.c os/linux_netlink.c @@ -62,9 +60,9 @@ endif if OS_WINDOWS if USE_USBDK -OS_SRC = $(WINDOWS_USBDK_SRC) +OS_SRC = $(WINDOWS_USBDK_SRC) $(WINDOWS_COMMON_SRC) else -OS_SRC = $(WINDOWS_USB_SRC) +OS_SRC = $(WINDOWS_USB_SRC) $(WINDOWS_COMMON_SRC) endif .rc.lo: diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 88d988d..330e456 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11031 +#define LIBUSB_NANO 11032 |