summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-09 14:18:23 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-09 14:18:23 +0000
commit0bc53e73cc22d15ebf7da345a18bd338142a0f10 (patch)
tree584fcb9f08bc1873102896deaf22b6d0c6fcdf3b /src
parentb8034bd9ee022e694358e67bb6b14c7673df42da (diff)
downloadopenocd_libswd-0bc53e73cc22d15ebf7da345a18bd338142a0f10.tar.gz
openocd_libswd-0bc53e73cc22d15ebf7da345a18bd338142a0f10.tar.bz2
openocd_libswd-0bc53e73cc22d15ebf7da345a18bd338142a0f10.tar.xz
openocd_libswd-0bc53e73cc22d15ebf7da345a18bd338142a0f10.zip
Simplify JTAG automake input file:
- Consolidate all individual driver variables into DRIVERFILES. - Eliminates all empty 'else' conditional clauses. - Move minidriver files to top of file. - Use MINIDRIVER conditional to build only driver(s) that will be linked. - Eliminate superfluous whitespace. git-svn-id: svn://svn.berlios.de/openocd/trunk@2176 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/jtag/Makefile.am138
1 files changed, 40 insertions, 98 deletions
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 40199c02..74ae863f 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -5,145 +5,87 @@ AM_CPPFLAGS = \
METASOURCES = AUTO
noinst_LTLIBRARIES = libjtag.la
-if BITBANG
-BITBANGFILES = bitbang.c
-else
-BITBANGFILES =
+DRIVERFILES =
+
+if MINIDRIVER
+
+if ECOSBOARD
+DRIVERFILES += zy1000/zy1000.c
+AM_CPPFLAGS += -I$(srcdir)/zy1000
+endif
+if MINIDRIVER_DUMMY
+DRIVERFILES += minidummy/minidummy.c commands.c
+AM_CPPFLAGS += -I$(srcdir)/minidummy
endif
-if PARPORT
-PARPORTFILES = parport.c
else
-PARPORTFILES =
-endif
+# Standard Driver: common files
+DRIVERFILES += driver.c commands.c
+
+if BITBANG
+DRIVERFILES += bitbang.c
+endif
+if PARPORT
+DRIVERFILES += parport.c
+endif
if DUMMY
-DUMMYFILES = dummy.c
-else
-DUMMYFILES =
+DRIVERFILES += dummy.c
endif
-
if FT2232_LIBFTDI
-FT2232FILES = ft2232.c
+DRIVERFILES += ft2232.c
else
if FT2232_FTD2XX
-FT2232FILES = ft2232.c
-else
-FT2232FILES =
+DRIVERFILES += ft2232.c
endif
endif
-
if AMTJTAGACCEL
-AMTJTAGACCELFILES = amt_jtagaccel.c
-else
-AMTJTAGACCELFILES =
+DRIVERFILES += amt_jtagaccel.c
endif
-
if EP93XX
-EP93XXFILES = ep93xx.c
-else
-EP93XXFILES =
+DRIVERFILES += ep93xx.c
endif
-
-if ECOSBOARD
-ECOSBOARDFILES = zy1000/zy1000.c
-AM_CPPFLAGS += -I$(srcdir)/zy1000
-else
-ECOSBOARDFILES =
-endif
-
-if MINIDRIVER_DUMMY
-MINIDUMMYFILES = minidummy/minidummy.c commands.c
-AM_CPPFLAGS += -I$(srcdir)/minidummy
-else
-MINIDUMMYFILES =
-endif
-
-if MINIDRIVER
-DRIVERFILES = $(MINIDUMMYFILES)
-else
-DRIVERFILES = driver.c commands.c
-endif
-
if AT91RM9200
-AT91RM9200FILES = at91rm9200.c
-else
-AT91RM9200FILES =
+DRIVERFILES += at91rm9200.c
endif
-
if GW16012
-GW16012FILES = gw16012.c
-else
-GW16012FILES =
+DRIVERFILES += gw16012.c
endif
-
if BITQ
-BITQFILES = bitq.c
-else
-BITQFILES =
+DRIVERFILES += bitq.c
endif
-
if PRESTO_LIBFTDI
-PRESTOFILES = presto.c
+DRIVERFILES += presto.c
else
if PRESTO_FTD2XX
-PRESTOFILES = presto.c
-else
-PRESTOFILES =
+DRIVERFILES += presto.c
endif
endif
-
if USBPROG
-USBPROGFILES = usbprog.c
-else
-USBPROGFILES =
+DRIVERFILES += usbprog.c
endif
-
if JLINK
-JLINKFILES = jlink.c
-else
-JLINKFILES =
+DRIVERFILES += jlink.c
endif
-
if RLINK
-RLINKFILES = rlink/rlink.c rlink/rlink_speed_table.c
-else
-RLINKFILES =
+DRIVERFILES += rlink/rlink.c rlink/rlink_speed_table.c
endif
-
if VSLLINK
-VSLLINKFILES = vsllink.c
-else
-VSLLINKFILES =
+DRIVERFILES += vsllink.c
endif
-
if ARMJTAGEW
-ARMJTAGEWFILES = arm-jtag-ew.c
-else
-ARMJTAGEWFILES =
+DRIVERFILES += arm-jtag-ew.c
endif
+endif
+# endif // MINIDRIVER
+
+
libjtag_la_SOURCES = \
core.c \
tcl.c \
interface.c \
- $(DRIVERFILES) \
- $(BITBANGFILES) \
- $(PARPORTFILES) \
- $(DUMMYFILES) \
- $(FT2232FILES) \
- $(AMTJTAGACCELFILES) \
- $(EP93XXFILES) \
- $(AT91RM9200FILES) \
- $(GW16012FILES) \
- $(BITQFILES) \
- $(PRESTOFILES) \
- $(USBPROGFILES) \
- $(ECOSBOARDFILES) \
- $(JLINKFILES) \
- $(RLINKFILES) \
- $(VSLLINKFILES) \
- $(ARMJTAGEWFILES)
+ $(DRIVERFILES)
noinst_HEADERS = \
interface.h \