Commit 82aa9af1 authored by zwelch's avatar zwelch
Browse files

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
parent 0bc53e73
......@@ -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)
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment