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 | |
| 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
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/jtag/Makefile.am | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/configure.in b/configure.in index 5d41d02e..ef552f5c 100644 --- a/configure.in +++ b/configure.in @@ -903,11 +903,11 @@ AM_CONDITIONAL(HTTPD, test $build_httpd = yes) AM_CONDITIONAL(AT91RM9200, test $build_at91rm9200 = yes) AM_CONDITIONAL(BITBANG, test $build_bitbang = yes) AM_CONDITIONAL(FT2232_LIBFTDI, test $build_ft2232_libftdi = yes) -AM_CONDITIONAL(FT2232_FTD2XX, test $build_ft2232_ftd2xx = yes) +AM_CONDITIONAL(FT2232_DRIVER, test $build_ft2232_ftd2xx = yes -o $build_ft2232_libftdi = yes) AM_CONDITIONAL(AMTJTAGACCEL, test $build_amtjtagaccel = yes) AM_CONDITIONAL(GW16012, test $build_gw16012 = yes) AM_CONDITIONAL(PRESTO_LIBFTDI, test $build_presto_libftdi = yes) -AM_CONDITIONAL(PRESTO_FTD2XX, test $build_presto_ftd2xx = yes) +AM_CONDITIONAL(PRESTO_DRIVER, test $build_presto_ftd2xx = yes -o $build_presto_libftdi = yes) AM_CONDITIONAL(USBPROG, test $build_usbprog = yes) AM_CONDITIONAL(OOCD_TRACE, test $build_oocd_trace = yes) AM_CONDITIONAL(JLINK, test $build_jlink = yes) 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 |