Dick Hollenbeck <dick@softplc.com> adds jtag_add_clocks() and implements those in...

[openocd] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7574e84aa32bb370c9a6c2011a0e9ef6171c4e79..0e0f50e480e713e181ec55af7d679833b3971ccf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,29 +47,19 @@ else
 if JLINK
 LIBUSB = -lusb
 else
-LIBUSB =
-endif
-endif
-
-if IS_WIN32
-if FTD2XXDIR
-FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib
+if RLINK
+LIBUSB = -lusb
 else
-FTD2XXLDADD = -lftd2xx
-endif
+if VSLLINK
+LIBUSB = -lusb
 else
-FTD2XXLDADD = -lftd2xx 
+LIBUSB =
 endif
-  
-if FT2232_FTD2XX
-FTD2XXLIB = $(FTD2XXLDADD)
-else
-if PRESTO_FTD2XX
-FTD2XXLIB = $(FTD2XXLDADD)
-else
-FTD2XXLIB =
 endif
 endif
+endif
+
+
 
 openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
        $(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
@@ -77,7 +67,7 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
        $(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
        $(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \
        $(top_builddir)/src/pld/libpld.a \
-       $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
+       $(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
 
 
 if HTTPD