Makefile.am: fix build for libftdi1, pass CFLAGS where appropriate

[openocd] / src / jtag / drivers / Makefile.am

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index e8f1efbc06db81ace77c53261851b365b48ce3a2..aea2b38a2c2a3e7684f0f15ca02cf106037a7257 100644 (file)
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -6,11 +6,16 @@ libocdjtagdrivers_la_LIBADD =
 libocdjtagdrivers_la_SOURCES = \
        $(DRIVERFILES)
 
-libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) $(LIBUSB0_CFLAGS)
+libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) \
+       $(LIBUSB0_CFLAGS) $(HIDAPI_CFLAGS) $(LIBFTDI_CFLAGS)
 
 ULINK_FIRMWARE = $(srcdir)/OpenULINK
 
-EXTRA_DIST = $(ULINK_FIRMWARE)
+EXTRA_DIST = $(ULINK_FIRMWARE) \
+       usb_blaster/README.CheapClone \
+       Makefile.rlink \
+       rlink_call.m4 \
+       rlink_init.m4
 
 DRIVERFILES =
 SUBDIRS=
@@ -41,7 +46,7 @@ endif
 if FT2232_DRIVER
 DRIVERFILES += ft2232.c
 endif
-if FTDI_DRIVER
+if FTDI
 DRIVERFILES += ftdi.c mpsse.c
 endif
 if JTAG_VPI
@@ -122,6 +127,10 @@ if OPENJTAG
 DRIVERFILES += openjtag.c
 endif
 
+if CMSIS_DAP
+DRIVERFILES += cmsis_dap_usb.c
+endif
+
 noinst_HEADERS = \
        bitbang.h \
        bitq.h \