jtag newtap change & huge manual update

[openocd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 467149797fa0789738f1931896d3b28f44d46325..d04308e5249fa0bb5ac3c96784549a4e700e4eab 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,25 @@
 bin_PROGRAMS = openocd
 bin_PROGRAMS = openocd

-openocd_SOURCES = openocd.c
+
+if ECOSBOARD
+MAINFILE = ecosboard.c
+else
+MAINFILE = main.c
+endif
+
+openocd_SOURCES = $(MAINFILE) openocd.c

 
 # set the include path found by configure
 
 # set the include path found by configure

-INCLUDES = -I$(top_srcdir)/src/helper \
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \

        -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target -I$(top_srcdir)/src/xsvf -I$(top_srcdir)/src/server \
        -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
 
        -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target -I$(top_srcdir)/src/xsvf -I$(top_srcdir)/src/server \
        -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
 

+# pass path to prefix path
+openocd_CPPFLAGS = \
+ -DPKGLIBDIR=\"$(pkglibdir)\" \
+ -DPKGBLDDATE=\"`date +%F-%R`\" \
+ -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\" \
+ @CPPFLAGS@
+

 # the library search path.
 openocd_LDFLAGS = $(all_libraries) 
 SUBDIRS = helper jtag xsvf target server flash pld
 # the library search path.
 openocd_LDFLAGS = $(all_libraries) 
 SUBDIRS = helper jtag xsvf target server flash pld


@@ -17,10 +31,24 @@ MINGWLDADD =
 endif
 
 if FT2232_LIBFTDI
 endif
 
 if FT2232_LIBFTDI

-FTDI2232LIB = -lftdi
+FTDI2232LIB = -lftdi -lusb
+else
+if PRESTO_LIBFTDI
+FTDI2232LIB = -lftdi -lusb

 else
 FTDI2232LIB =
 endif
 else
 FTDI2232LIB =
 endif

+endif
+
+if USBPROG
+LIBUSB = -lusb
+else
+if JLINK
+LIBUSB = -lusb
+else
+LIBUSB =
+endif
+endif

 
 if IS_WIN32
 if FTD2XXDIR
 
 if IS_WIN32
 if FTD2XXDIR


@@ -35,8 +63,12 @@ endif
 if FT2232_FTD2XX
 FTD2XXLIB = $(FTD2XXLDADD)
 else
 if FT2232_FTD2XX
 FTD2XXLIB = $(FTD2XXLDADD)
 else

+if PRESTO_FTD2XX
+FTD2XXLIB = $(FTD2XXLDADD)
+else

 FTD2XXLIB =
 endif
 FTD2XXLIB =
 endif

+endif

 
 openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
        $(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
 
 openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
        $(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \


@@ -44,4 +76,24 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
        $(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
        $(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \
        $(top_builddir)/src/pld/libpld.a \
        $(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
        $(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \
        $(top_builddir)/src/pld/libpld.a \

-       $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD)
+       $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
+
+nobase_dist_pkglib_DATA = \
+       tcl/bitsbytes.tcl                       \
+       tcl/chip/atmel/at91/aic.tcl             \
+       tcl/chip/atmel/at91/at91sam7x128.tcl    \
+       tcl/chip/atmel/at91/at91sam7x256.tcl    \
+       tcl/chip/atmel/at91/pmc.tcl             \
+       tcl/chip/atmel/at91/rtt.tcl             \
+       tcl/chip/atmel/at91/usarts.tcl          \
+       tcl/chip/st/stm32/stm32.tcl             \
+       tcl/chip/st/stm32/stm32_rcc.tcl         \
+       tcl/chip/st/stm32/stm32_regs.tcl        \
+       tcl/cpu/arm/arm7tdmi.tcl                \
+       tcl/cpu/arm/arm920.tcl                  \
+       tcl/cpu/arm/arm946.tcl                  \
+       tcl/cpu/arm/arm966.tcl                  \
+       tcl/cpu/arm/cortex_m3.tcl               \
+       tcl/memory.tcl                          \
+       tcl/mmr_helpers.tcl                     \
+       tcl/readable.tcl