Advertisement
mmu_man

libusb Haiku tmp

Aug 9th, 2014
293
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.26 KB | None | 0 0
  1. diff --git a/libusb/Makefile.am b/libusb/Makefile.am
  2. index 0af3e95..79dc9f8 100644
  3. --- a/libusb/Makefile.am
  4. +++ b/libusb/Makefile.am
  5. @@ -77,7 +77,7 @@ libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c strerror.c sync.c \
  6.         os/poll_posix.h os/poll_windows.h
  7.  
  8.  if OS_HAIKU
  9. -libusb_1_0_la_LIBADD = os/haiku/libhaikuusb.a
  10. +libusb_1_0_la_LIBADD = os/haiku/libhaikuusb.la
  11.  endif
  12.  
  13.  hdrdir = $(includedir)/libusb-1.0
  14. diff --git a/libusb/os/haiku/Makefile.am b/libusb/os/haiku/Makefile.am
  15. index 541ff26..c8856d3 100644
  16. --- a/libusb/os/haiku/Makefile.am
  17. +++ b/libusb/os/haiku/Makefile.am
  18. @@ -1,2 +1,3 @@
  19. -lib_LIBRARIES = libhaikuusb.a
  20. -libhaikuusb_a_SOURCES = haiku_usb_raw.cpp haiku_usb_backend.cpp haiku_pollfs.cpp
  21. +noinst_LTLIBRARIES = libhaikuusb.la
  22. +libhaikuusb_la_CPPFLAGS = $(AM_CPPFLAGS) -I../.. -I../../..
  23. +libhaikuusb_la_SOURCES = haiku_usb_raw.cpp haiku_usb_backend.cpp haiku_pollfs.cpp
  24. diff --git a/libusb/os/haiku/configure.ac b/libusb/os/haiku/configure.ac
  25. index f8059c8..675f8e6 100644
  26. --- a/libusb/os/haiku/configure.ac
  27. +++ b/libusb/os/haiku/configure.ac
  28. @@ -1,5 +1,7 @@
  29.  AC_INIT([haikuusb], [1.0])
  30. -AM_INIT_AUTOMAKE
  31. +AM_INIT_AUTOMAKE([no-define])
  32. +AM_MAINTAINER_MODE
  33. +LT_INIT
  34.  AC_PROG_CXX
  35.  AC_CONFIG_FILES([Makefile])
  36.  AC_OUTPUT
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement