[Openocd-svn] r2177 - in trunk: . src/jtag

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-09 16:18:28 +0200 (Tue, 09 Jun 2009)
New Revision: 2177

Modified:
   trunk/configure.in
   trunk/src/jtag/Makefile.am
Log:
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.


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-06-09 14:18:23 UTC (rev 2176)
+++ trunk/configure.in	2009-06-09 14:18:28 UTC (rev 2177)
@@ -903,11 +903,11 @@
 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)

Modified: trunk/src/jtag/Makefile.am
===================================================================
--- trunk/src/jtag/Makefile.am	2009-06-09 14:18:23 UTC (rev 2176)
+++ trunk/src/jtag/Makefile.am	2009-06-09 14:18:28 UTC (rev 2177)
@@ -32,13 +32,9 @@
 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
 endif
@@ -54,13 +50,9 @@
 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
 endif