X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2FMakefile.am;h=2aaf8fd8420b604cf232e25f92ea0bf046060851;hb=refs%2Fchanges%2F98%2F2598%2F8;hp=72fbb3471836abe2b6c0ed5a6054ee94837cd5d4;hpb=4dc8cd201c667bac72bc083ef1fa1b285eb093fc;p=openocd.git

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 72fbb34718..2aaf8fd842 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -7,15 +7,35 @@ libocdjtagdrivers_la_SOURCES = \
 	$(DRIVERFILES)
 
 libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) \
-	$(LIBUSB0_CFLAGS) $(HIDAPI_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=
 
+if JLINK
+if INTERNAL_LIBJAYLINK
+SUBDIRS += libjaylink
+
+libjaylink_internal_la_SOURCES = jlink.c
+libjaylink_internal_la_LIBADD = libjaylink/libjaylink/libjaylink.la
+libjaylink_internal_la_CPPFLAGS = -I$(builddir)/libjaylink/libjaylink \
+	-I$(srcdir)/libjaylink $(AM_CPPFLAGS)
+
+noinst_LTLIBRARIES += libjaylink_internal.la
+libocdjtagdrivers_la_LIBADD += libjaylink_internal.la
+else
+DRIVERFILES += jlink.c
+endif
+endif
+
 # Standard Driver: common files
 DRIVERFILES += driver.c
 
@@ -73,9 +93,6 @@ endif
 if USBPROG
 DRIVERFILES += usbprog.c
 endif
-if JLINK
-DRIVERFILES += jlink.c
-endif
 if RLINK
 DRIVERFILES += rlink.c rlink_speed_table.c
 endif
@@ -147,4 +164,10 @@ noinst_HEADERS = \
 	versaloon/versaloon_include.h \
 	versaloon/versaloon_internal.h
 
+DIST_SUBDIRS = usb_blaster
+
+if INTERNAL_LIBJAYLINK
+DIST_SUBDIRS += libjaylink
+endif
+
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in