libusb: require pkg-config support

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

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index f977d42e34e83db358a19880a47b5124b7f13fea..e8f1efbc06db81ace77c53261851b365b48ce3a2 100644 (file)
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -1,34 +1,32 @@
 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)
 
 ULINK_FIRMWARE = $(srcdir)/OpenULINK
 
 EXTRA_DIST = $(ULINK_FIRMWARE)
 
 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,8 +41,15 @@ endif
 if FT2232_DRIVER
 DRIVERFILES += ft2232.c
 endif
+if FTDI_DRIVER
+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
@@ -75,7 +80,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
@@ -95,8 +101,9 @@ endif
 if REMOTE_BITBANG
 DRIVERFILES += remote_bitbang.c
 endif
-if STLINK
+if HLADAPTER
 DRIVERFILES += stlink_usb.c
+DRIVERFILES += ti_icdi_usb.c
 endif
 if OSBDM
 DRIVERFILES += osbdm.c
@@ -104,16 +111,35 @@ endif
 if OPENDOUS
 DRIVERFILES += opendous.c
 endif
+if SYSFSGPIO
+DRIVERFILES += sysfsgpio.c
+endif
+if BCM2835GPIO
+DRIVERFILES += bcm2835gpio.c
+endif
+
+if OPENJTAG
+DRIVERFILES += openjtag.c
+endif
 
 noinst_HEADERS = \
        bitbang.h \
        bitq.h \
+       ftd2xx_common.h \
+       libusb0_common.h \
+       libusb1_common.h \
+       libusb_common.h \
        minidriver_imp.h \
+       mpsse.h \
        rlink.h \
        rlink_dtc_cmd.h \
        rlink_ep1_cmd.h \
        rlink_st7.h \
        usb_common.h \
-       stlink_usb.h
+       versaloon/usbtoxxx/usbtoxxx.h \
+       versaloon/usbtoxxx/usbtoxxx_internal.h \
+       versaloon/versaloon.h \
+       versaloon/versaloon_include.h \
+       versaloon/versaloon_internal.h
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in