X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fjtag%2Fdrivers%2FMakefile.am;h=07824f6789b950d1ad11fe57c52b2a51ee1e69d3;hb=6572dd97b3a6e9c6afea81d47a507683ecc95698;hp=3e5974da48d35de60ca69ee2e3fa3a51c61f5e8d;hpb=83c67b7ac7635260d09d9fe15a50a34440c0c4bb;p=openocd.git

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 3e5974da48..07824f6789 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -19,9 +19,10 @@ DRIVERFILES =
 
 # Standard Driver: common files
 DRIVERFILES += %D%/driver.c
+DRIVERFILES += %D%/jtag_usb_common.c
 
 if USE_LIBUSB1
-DRIVERFILES += %D%/libusb1_common.c
+DRIVERFILES += %D%/libusb_helper.c
 %C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBUSB1_CFLAGS)
 %C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB1_LIBS)
 endif
@@ -30,9 +31,6 @@ if USE_LIBUSB0
 DRIVERFILES += %D%/usb_common.c
 %C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBUSB0_CFLAGS)
 %C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB0_LIBS)
-if !USE_LIBUSB1
-DRIVERFILES += %D%/libusb0_common.c
-endif
 endif
 
 if USE_LIBFTDI
@@ -80,6 +78,9 @@ if USB_BLASTER_DRIVER
 %C%_libocdjtagdrivers_la_LIBADD += %D%/usb_blaster/libocdusbblaster.la
 include %D%/usb_blaster/Makefile.am
 endif
+if FT232R
+DRIVERFILES += %D%/ft232r.c
+endif
 if AMTJTAGACCEL
 DRIVERFILES += %D%/amt_jtagaccel.c
 endif
@@ -132,6 +133,9 @@ if HLADAPTER
 DRIVERFILES += %D%/stlink_usb.c
 DRIVERFILES += %D%/ti_icdi_usb.c
 endif
+if RSHIM
+DRIVERFILES += %D%/rshim.c
+endif
 if OSBDM
 DRIVERFILES += %D%/osbdm.c
 endif
@@ -141,6 +145,9 @@ endif
 if SYSFSGPIO
 DRIVERFILES += %D%/sysfsgpio.c
 endif
+if XLNX_PCIE_XVC
+DRIVERFILES += %D%/xlnx-pcie-xvc.c
+endif
 if BCM2835GPIO
 DRIVERFILES += %D%/bcm2835gpio.c
 endif
@@ -153,17 +160,18 @@ endif
 if IMX_GPIO
 DRIVERFILES += %D%/imx_gpio.c
 endif
-
 if KITPROG
 DRIVERFILES += %D%/kitprog.c
 endif
+if XDS110
+DRIVERFILES += %D%/xds110.c
+endif
 
 DRIVERHEADERS = \
 	%D%/bitbang.h \
 	%D%/bitq.h \
-	%D%/libusb0_common.h \
-	%D%/libusb1_common.h \
-	%D%/libusb_common.h \
+	%D%/jtag_usb_common.h \
+	%D%/libusb_helper.h \
 	%D%/minidriver_imp.h \
 	%D%/mpsse.h \
 	%D%/rlink.h \
@@ -176,4 +184,3 @@ DRIVERHEADERS = \
 	%D%/versaloon/versaloon.h \
 	%D%/versaloon/versaloon_include.h \
 	%D%/versaloon/versaloon_internal.h
-