diff options
author | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-07-15 11:19:33 +0000 |
---|---|---|
committer | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-07-15 11:19:33 +0000 |
commit | 1429d2c659ab9b84dee673e7697da7eab44a8f90 (patch) | |
tree | 03230f43a7404b1e22f0ffdafb69e41196808b30 /src/Makefile.am | |
parent | 32c6d70f6acd41dd1af5ea73051dd6c8a46eac14 (diff) |
- added support for Asix Presto JTAG interface (thanks to Pavel Chromy and Asix for making this addition possible)
- added support for usbprog (thanks to Benedikt Sauter)
- make OpenOCD listen for WM_QUIT messages on windows (thanks to Pavel Chromy)
- register at_exit handler to do necessary unregistering (thanks to Pavel Chromy)
- added dummy ETM capture driver to allow ETM to be registered without a capture driver
git-svn-id: svn://svn.berlios.de/openocd/trunk@180 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 46714979..c8e7c81d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,6 +22,12 @@ else FTDI2232LIB = endif +if USBPROG +LIBUSB = -lusb +else +LIBUSB = +endif + if IS_WIN32 if FTD2XXDIR FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib @@ -35,8 +41,12 @@ endif if FT2232_FTD2XX FTD2XXLIB = $(FTD2XXLDADD) else +if PRESTO +FTD2XXLIB = $(FTD2XXLDADD) +else FTD2XXLIB = endif +endif openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \ $(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \ @@ -44,4 +54,4 @@ 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) + $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB) |