misc code review updates

[fw/openocd] / src / jtag / Makefile.am

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index c63c734a7f3663fba6a1464687703e0050937ed0..39b4b59a9f40a813006df77aca0f8e913babc45c 100644 (file)
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,60 +1,56 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src
 
-if FTD2XXDIR
-if IS_MINGW
-FTD2XXINC = -I@WITH_FTD2XX@
-else
-FTD2XXINC = -I@WITH_FTD2XX@/
-endif
-else
-FTD2XXINC =
-endif
-
-INCLUDES = -I$(top_srcdir)/src/helper $(FTD2XXINC) $(all_includes)
 METASOURCES = AUTO
-noinst_LIBRARIES = libjtag.a
+noinst_LTLIBRARIES = libjtag.la
 
-if BITBANG
-BITBANGFILES = bitbang.c
-else
-BITBANGFILES =
-endif
+SUBDIRS =
+DRIVERFILES =
+libjtag_la_LIBADD =
 
-if PARPORT
-PARPORTFILES = parport.c
-else
-PARPORTFILES =
-endif
+if MINIDRIVER
 
-if FT2232_LIBFTDI
-FT2232FILES = ft2232.c
-else
-FT2232FILES =
-endif
+# for minidriver_imp.h
+AM_CPPFLAGS += -I$(srcdir)/minidriver
 
-if FT2232_FTD2XX
-FT2232FILES = ft2232.c
-else
-FT2232FILES =
+if ZY1000
+DRIVERFILES += zy1000/zy1000.c
+AM_CPPFLAGS += -I$(srcdir)/zy1000
 endif
-
-if AMTJTAGACCEL
-AMTJTAGACCELFILES = amt_jtagaccel.c
-else
-AMTJTAGACCELFILES =
+if MINIDRIVER_DUMMY
+DRIVERFILES += minidummy/minidummy.c commands.c
+AM_CPPFLAGS += -I$(srcdir)/minidummy
 endif
 
-if EP93XX
-EP93XXFILES = ep93xx.c
 else
-EP93XXFILES =
-endif
 
-if AT91RM9200
-AT91RM9200FILES = at91rm9200.c
-else
-AT91RM9200FILES =
+DRIVERFILES += commands.c
+
+SUBDIRS += drivers
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/drivers/libocdjtagdrivers.la
+
+# for minidriver_imp.h
+AM_CPPFLAGS += -I$(srcdir)/drivers
+
 endif
+# endif // MINIDRIVER
+
+libjtag_la_SOURCES = \
+       core.c \
+       interface.c \
+       interfaces.c \
+       tcl.c \
+       $(DRIVERFILES)
+
+noinst_HEADERS = \
+       commands.h \
+       interface.h \
+       interfaces.h \
+       minidriver.h \
+       jtag.h \
+       minidriver/minidriver_imp.h \
+       minidummy/jtag_minidriver.h
 
-libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) $(AT91RM9200FILES)
+EXTRA_DIST = startup.tcl
 
-noinst_HEADERS = bitbang.h jtag.h
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in