package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch

   1 From f346045e0f63289909322a3264e69b967a911636 Mon Sep 17 00:00:00 2001
   2 From: Alec Leamas <leamas.alec@gmail.com>
   3 Date: Tue, 24 May 2016 19:56:09 +0200
   4 Subject: [PATCH] Don't build commandir unless we have usb.h (#191).
   5
   6 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
   7 (backported from git master:
   8  https://sourceforge.net/p/lirc/git/ci/f346045e0f63289909322a3264e69b967a911636/tree/plugins/Makefile.am?diff=4b26eb383291576b3f56820c6cec5f6a75814807)
   9 ---
  10  plugins/Makefile.am | 14 +++++++++-----
  11  1 file changed, 9 insertions(+), 5 deletions(-)
  12
  13 diff --git a/plugins/Makefile.am b/plugins/Makefile.am
  14 index 3bd89ed..2116658 100644
  15 --- a/plugins/Makefile.am
  16 +++ b/plugins/Makefile.am
  17 @@ -14,6 +14,7 @@ EXTRA_DIST                  = pluginlist.am make-pluginlist.sh
  18  plugin_LTLIBRARIES          =
  19
  20  if BUILD_USB
  21 +
  22  plugin_LTLIBRARIES          += atilibusb.la
  23  atilibusb_la_SOURCES        = atilibusb.c
  24  atilibusb_la_LDFLAGS        = $(AM_LDFLAGS) @usb_libs@
  25 @@ -33,6 +34,14 @@ plugin_LTLIBRARIES          += srm7500libusb.la
  26  srm7500libusb_la_SOURCES    = srm7500libusb.c
  27  srm7500libusb_la_LDFLAGS    = $(AM_LDFLAGS) @usb_libs@
  28  srm7500libusb_la_CFLAGS     = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
  29 +
  30 +if !BSD
  31 +plugin_LTLIBRARIES          += commandir.la
  32 +commandir_la_SOURCES        = commandir.c
  33 +commandir_la_LDFLAGS        = $(AM_LDFLAGS) @usb_libs@
  34 +commandir_la_CFLAGS         = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
  35 +endif
  36 +
  37  endif
  38
  39  if BUILD_FTDI
  40 @@ -99,11 +108,6 @@ if !BSD
  41  plugin_LTLIBRARIES          += default.la
  42  default_la_SOURCES          = default.c
  43
  44 -plugin_LTLIBRARIES          += commandir.la
  45 -commandir_la_SOURCES        = commandir.c
  46 -commandir_la_LDFLAGS        = $(AM_LDFLAGS) @usb_libs@
  47 -commandir_la_CFLAGS         = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
  48 -
  49  plugin_LTLIBRARIES          += hiddev.la
  50  hiddev_la_SOURCES           = hiddev.c
  51
  52 --
  53 2.8.1
  54