diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-09 14:18:28 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-09 14:18:28 +0000 |
| commit | 82aa9af1ad529cbea13dfe5ad4b2c359444d4d07 (patch) | |
| tree | 78afb47f9bb0c4d413e90a215754bff720663c68 /src/jtag | |
| parent | 0bc53e73cc22d15ebf7da345a18bd338142a0f10 (diff) | |
| download | openocd+libswd-82aa9af1ad529cbea13dfe5ad4b2c359444d4d07.tar.gz openocd+libswd-82aa9af1ad529cbea13dfe5ad4b2c359444d4d07.tar.bz2 openocd+libswd-82aa9af1ad529cbea13dfe5ad4b2c359444d4d07.tar.xz openocd+libswd-82aa9af1ad529cbea13dfe5ad4b2c359444d4d07.zip | |
Improve use of automake conditionals for FTDI-based JTAG drivers:
- Remove once-used XXX_FTD2XX symbols; replace with XXX_DRIVER symbols.
- Enabled when either libftdi or FTD2xx driver should be built.
- Eliminates redundant DRIVERSFILE assignment in JTAG automake input.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2177 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag')
| -rw-r--r-- | src/jtag/Makefile.am | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am index 74ae863f..58bbff36 100644 --- a/src/jtag/Makefile.am +++ b/src/jtag/Makefile.am @@ -32,12 +32,8 @@ endif if DUMMY DRIVERFILES += dummy.c endif -if FT2232_LIBFTDI +if FT2232_DRIVER DRIVERFILES += ft2232.c -else -if FT2232_FTD2XX -DRIVERFILES += ft2232.c -endif endif if AMTJTAGACCEL DRIVERFILES += amt_jtagaccel.c @@ -54,12 +50,8 @@ endif if BITQ DRIVERFILES += bitq.c endif -if PRESTO_LIBFTDI +if PRESTO_DRIVER DRIVERFILES += presto.c -else -if PRESTO_FTD2XX -DRIVERFILES += presto.c -endif endif if USBPROG DRIVERFILES += usbprog.c |