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 6d232d26f64c58fb6b2c51698165fc8e8225dbf6..aea2b38a2c2a3e7684f0f15ca02cf106037a7257 100644 (file)
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -1,34 +1,37 @@
 include $(top_srcdir)/common.mk
 
 noinst_LTLIBRARIES = libocdjtagdrivers.la
+libocdjtagdrivers_la_LIBADD =
 
 libocdjtagdrivers_la_SOURCES = \
        $(DRIVERFILES)
 
-ocddatadir = $(pkglibdir)
-nobase_dist_ocddata_DATA =
+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=
 
 # Standard Driver: common files
 DRIVERFILES += driver.c
 
-if USB
-DRIVERFILES += usb_common.c
-endif
-
 if USE_LIBUSB1
 DRIVERFILES += libusb1_common.c
-else
+endif
 
 if USE_LIBUSB0
+DRIVERFILES += usb_common.c
+if !USE_LIBUSB1
 DRIVERFILES += libusb0_common.c
 endif
-
 endif
 
 if BITBANG
@@ -43,11 +46,15 @@ endif
 if FT2232_DRIVER
 DRIVERFILES += ft2232.c
 endif
-if FTDI_DRIVER
+if FTDI
 DRIVERFILES += ftdi.c mpsse.c
 endif
+if JTAG_VPI
+DRIVERFILES += jtag_vpi.c
+endif
 if USB_BLASTER_DRIVER
-DRIVERFILES += usb_blaster.c
+SUBDIRS += usb_blaster
+libocdjtagdrivers_la_LIBADD += $(top_builddir)/src/jtag/drivers/usb_blaster/libocdusbblaster.la
 endif
 if AMTJTAGACCEL
 DRIVERFILES += amt_jtagaccel.c
@@ -78,7 +85,8 @@ DRIVERFILES += rlink.c rlink_speed_table.c
 endif
 if ULINK
 DRIVERFILES += ulink.c
-nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
+ulinkdir = $(pkgdatadir)/OpenULINK
+dist_ulink_DATA = $(ULINK_FIRMWARE)/ulink_firmware.hex
 endif
 if VSLLINK
 DRIVERFILES += versaloon/usbtoxxx/usbtogpio.c
@@ -100,6 +108,7 @@ DRIVERFILES += remote_bitbang.c
 endif
 if HLADAPTER
 DRIVERFILES += stlink_usb.c
+DRIVERFILES += ti_icdi_usb.c
 endif
 if OSBDM
 DRIVERFILES += osbdm.c
@@ -110,6 +119,17 @@ endif
 if SYSFSGPIO
 DRIVERFILES += sysfsgpio.c
 endif
+if BCM2835GPIO
+DRIVERFILES += bcm2835gpio.c
+endif
+
+if OPENJTAG
+DRIVERFILES += openjtag.c
+endif
+
+if CMSIS_DAP
+DRIVERFILES += cmsis_dap_usb.c
+endif
 
 noinst_HEADERS = \
        bitbang.h \