X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2FMakefile.am;h=50ee263d003e65eb16432ae76ffdfce7556cd3fc;hp=55f7e6a2b16e8f30314561670cc02ffd5adb9219;hb=d1b74376336814266236054f925a9964b87dd8a5;hpb=a021735db4a77a0b57e8fa66c7b7bc6f79f23c65

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 55f7e6a2b1..50ee263d00 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,108 +1,72 @@
+noinst_LTLIBRARIES += %D%/libjtag.la
 
+JTAG_SRCS =
+%C%_libjtag_la_LIBADD =
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper  $(all_includes) -I$(top_srcdir)/src/target 
-METASOURCES = AUTO
-noinst_LIBRARIES = libjtag.a
+BUILT_SOURCES += %D%/minidriver_imp.h
+CLEANFILES += %D%/minidriver_imp.h
 
-if BITBANG
-BITBANGFILES = bitbang.c
-else
-BITBANGFILES =
-endif
+if MINIDRIVER
 
-if PARPORT
-PARPORTFILES = parport.c
-else
-PARPORTFILES =
+if ZY1000
+JTAG_SRCS += %D%/zy1000/zy1000.c
+JTAG_MINIDRIVER_DIR = %D%/zy1000
 endif
-
-if DUMMY
-DUMMYFILES = dummy.c
-else
-DUMMYFILES =
+if MINIDRIVER_DUMMY
+JTAG_SRCS += %D%/minidummy/minidummy.c %D%/commands.c
+JTAG_MINIDRIVER_DIR = %D%/minidummy
 endif
 
-if FT2232_LIBFTDI
-FT2232FILES = ft2232.c
-else
-if FT2232_FTD2XX
-FT2232FILES = ft2232.c
-else
-FT2232FILES =
-endif
-endif
+MINIDRIVER_IMP_DIR = %D%/minidriver
 
-if AMTJTAGACCEL
-AMTJTAGACCELFILES = amt_jtagaccel.c
-else
-AMTJTAGACCELFILES =
-endif
+%D%/jtag_minidriver.h: $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h
+	cp $< $@
 
-if EP93XX
-EP93XXFILES = ep93xx.c
-else
-EP93XXFILES =
-endif
+BUILT_SOURCES += %D%/jtag_minidriver.h
 
-if ECOSBOARD
-ECOSBOARDFILES = zy1000.c
-else
-ECOSBOARDFILES =
-endif
+CLEANFILES += %D%/jtag_minidriver.h
 
-if AT91RM9200
-AT91RM9200FILES = at91rm9200.c
 else
-AT91RM9200FILES =
-endif
 
-if GW16012
-GW16012FILES = gw16012.c
-else
-GW16012FILES =
-endif
+MINIDRIVER_IMP_DIR = %D%/drivers
+JTAG_SRCS += %D%/commands.c
 
-if BITQ
-BITQFILES = bitq.c
-else
-BITQFILES =
+if HLADAPTER
+include %D%/hla/Makefile.am
+%C%_libjtag_la_LIBADD += $(top_builddir)/%D%/hla/libocdhla.la
 endif
 
-if PRESTO_LIBFTDI
-PRESTOFILES = presto.c
-else
-if PRESTO_FTD2XX
-PRESTOFILES = presto.c
-else
-PRESTOFILES =
-endif
+if AICE
+include %D%/aice/Makefile.am
+%C%_libjtag_la_LIBADD += $(top_builddir)/%D%/aice/libocdaice.la
 endif
 
-if USBPROG
-USBPROGFILES = usbprog.c
-else
-USBPROGFILES =
-endif
+include %D%/drivers/Makefile.am
+%C%_libjtag_la_LIBADD += $(top_builddir)/%D%/drivers/libocdjtagdrivers.la
 
-if JLINK
-JLINKFILES = jlink.c
-else
-JLINKFILES =
 endif
+# endif // MINIDRIVER
 
-if RLINK
-RLINKFILES = rlink/rlink.c rlink/rlink_speed_table.c
-else
-RLINKFILES =
-endif
+%D%/minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
+	cp $< $@
 
-if VSLLINK
-VSLLINKFILES = vsllink.c
-else
-VSLLINKFILES =
-endif
 
-libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
-	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES)
+%C%_libjtag_la_SOURCES = \
+	%D%/adapter.c \
+	%D%/core.c \
+	%D%/interface.c \
+	%D%/interfaces.c \
+	%D%/tcl.c \
+	%D%/commands.h \
+	%D%/driver.h \
+	%D%/interface.h \
+	%D%/interfaces.h \
+	%D%/minidriver.h \
+	%D%/jtag.h \
+	%D%/minidriver/minidriver_imp.h \
+	%D%/minidummy/jtag_minidriver.h \
+	%D%/swd.h \
+	%D%/tcl.h \
+	$(JTAG_SRCS)
 
-noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h
+STARTUP_TCL_SRCS += %D%/startup.tcl