package/libusb/patches/no-libusbpp.patch

   1 --- libusb-0.1.10a.dev/Makefile.in.old  2005-04-20 21:49:04.000000000 +0200
   2 +++ libusb-0.1.10a.dev/Makefile.in      2005-04-20 21:50:23.000000000 +0200
   3 @@ -16,7 +16,7 @@
   4
   5
   6
   7 -SOURCES = $(libusb_la_SOURCES) $(libusbpp_la_SOURCES)
   8 +SOURCES = $(libusb_la_SOURCES)
   9
  10  srcdir = @srcdir@
  11  top_srcdir = @top_srcdir@
  12 @@ -71,8 +71,8 @@
  13  am_libusb_la_OBJECTS = usb.lo error.lo descriptors.lo $(am__objects_1)
  14  libusb_la_OBJECTS = $(am_libusb_la_OBJECTS)
  15  libusbpp_la_LIBADD =
  16 -am_libusbpp_la_OBJECTS = usbpp.lo
  17 -libusbpp_la_OBJECTS = $(am_libusbpp_la_OBJECTS)
  18 +am_libusbpp_la_OBJECTS =
  19 +libusbpp_la_OBJECTS =
  20  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  21  SCRIPTS = $(bin_SCRIPTS)
  22  DEFAULT_INCLUDES =
  23 @@ -80,8 +80,7 @@
  24  am__depfiles_maybe = depfiles
  25  @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bsd.Plo ./$(DEPDIR)/darwin.Plo \
  26  @AMDEP_TRUE@   ./$(DEPDIR)/descriptors.Plo ./$(DEPDIR)/error.Plo \
  27 -@AMDEP_TRUE@   ./$(DEPDIR)/linux.Plo ./$(DEPDIR)/usb.Plo \
  28 -@AMDEP_TRUE@   ./$(DEPDIR)/usbpp.Plo
  29 +@AMDEP_TRUE@   ./$(DEPDIR)/linux.Plo ./$(DEPDIR)/usb.Plo
  30  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  31         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  32  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
  33 @@ -98,8 +97,8 @@
  34  CXXLD = $(CXX)
  35  CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
  36         $(AM_LDFLAGS) $(LDFLAGS) -o $@
  37 -SOURCES = $(libusb_la_SOURCES) $(libusbpp_la_SOURCES)
  38 -DIST_SOURCES = $(am__libusb_la_SOURCES_DIST) $(libusbpp_la_SOURCES)
  39 +SOURCES = $(libusb_la_SOURCES)
  40 +DIST_SOURCES = $(am__libusb_la_SOURCES_DIST)
  41  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
  42         html-recursive info-recursive install-data-recursive \
  43         install-exec-recursive install-info-recursive \
  44 @@ -250,7 +249,7 @@
  45  # require automake 1.4
  46  # gnu strictness chokes on README being autogenerated
  47  AUTOMAKE_OPTIONS = 1.4 foreign
  48 -SUBDIRS = . tests doc
  49 +SUBDIRS = .
  50  AM_CFLAGS = $(CFLAGS_EXT)
  51  configincludedir = $(pkglibdir)/include
  52  bin_SCRIPTS = libusb-config
  53 @@ -259,7 +258,7 @@
  54               apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png
  55
  56  EXTRA_libusb_la_SOURCE = linux.c linux.h bsd.c darwin.c
  57 -lib_LTLIBRARIES = libusb.la libusbpp.la
  58 +lib_LTLIBRARIES = libusb.la
  59  @BSD_API_FALSE@@DARWIN_API_FALSE@@LINUX_API_FALSE@OS_SUPPORT =
  60  @BSD_API_FALSE@@DARWIN_API_TRUE@@LINUX_API_FALSE@OS_SUPPORT = darwin.c
  61  @BSD_API_TRUE@@LINUX_API_FALSE@OS_SUPPORT = bsd.c
  62 @@ -269,24 +268,18 @@
  63  AM_CPPFLAGS = -I.
  64  AM_CXXFLAGS =
  65  libusb_la_SOURCES = usb.c usbi.h error.c error.h descriptors.c $(OS_SUPPORT)
  66 -libusbpp_la_SOURCES = usbpp.cpp usbpp.h
  67 +libusbpp_la_SOURCES =
  68
  69  # Do not add usb.h to *_SOURCES, regardless of dependencies.
  70  # It would be added to the dist tarball, which it shouldn't be.
  71  nodist_include_HEADERS = usb.h
  72 -include_HEADERS = usbpp.h
  73 +include_HEADERS =
  74  libusb_la_LDFLAGS = \
  75         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
  76         -release $(LT_RELEASE) \
  77         -export-dynamic \
  78         $(LDADDS)
  79
  80 -libusbpp_la_LDFLAGS = \
  81 -       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
  82 -       -release $(LT_RELEASE) \
  83 -       -export-dynamic \
  84 -       $(LDADDS) -lusb $(QT_LDFLAGS)
  85 -
  86  all: config.h
  87         $(MAKE) $(AM_MAKEFLAGS) all-recursive
  88
  89 @@ -381,8 +374,6 @@
  90         done
  91  libusb.la: $(libusb_la_OBJECTS) $(libusb_la_DEPENDENCIES)
  92         $(LINK) -rpath $(libdir) $(libusb_la_LDFLAGS) $(libusb_la_OBJECTS) $(libusb_la_LIBADD) $(LIBS)
  93 -libusbpp.la: $(libusbpp_la_OBJECTS) $(libusbpp_la_DEPENDENCIES)
  94 -       $(CXXLINK) -rpath $(libdir) $(libusbpp_la_LDFLAGS) $(libusbpp_la_OBJECTS) $(libusbpp_la_LIBADD) $(LIBS)
  95  install-binSCRIPTS: $(bin_SCRIPTS)
  96         @$(NORMAL_INSTALL)
  97         test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
  98 @@ -415,7 +406,6 @@
  99  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@
 100  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux.Plo@am__quote@
 101  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usb.Plo@am__quote@
 102 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usbpp.Plo@am__quote@
 103
 104  .c.o:
 105  @am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \