X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2FMakefile.am;h=ff0eb6e519fbe5307b68a8448891ce1726bed1d4;hp=2647fd5e3f6825d2554349e9adf707e1a5c34c26;hb=163bd86071a90b77eb8b0e03927b0ed8908eb892;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f

diff --git a/src/Makefile.am b/src/Makefile.am
index 2647fd5e3f..ff0eb6e519 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,29 @@
 bin_PROGRAMS = openocd
-openocd_SOURCES = openocd.c
+
+if ECOSBOARD
+MAINFILE = ecosboard.c
+else
+MAINFILE = main.c jim.c
+endif
+
+
+openocd_SOURCES = $(MAINFILE) openocd.c
 
 # set the include path found by configure
 INCLUDES = -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 $(all_includes)
+	-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
+SUBDIRS = helper jtag xsvf target server flash pld
 
 if IS_MINGW
 MINGWLDADD = -lwsock32
@@ -16,11 +31,25 @@ else
 MINGWLDADD =
 endif
 
-if FTDI2232
-FTDI2232LIB = -lftdi
+if FT2232_LIBFTDI
+FTDI2232LIB = -lftdi -lusb
+else
+if PRESTO_LIBFTDI
+FTDI2232LIB = -lftdi -lusb
 else
 FTDI2232LIB =
 endif
+endif
+
+if USBPROG
+LIBUSB = -lusb
+else
+if JLINK
+LIBUSB = -lusb
+else
+LIBUSB =
+endif
+endif
 
 if IS_WIN32
 if FTD2XXDIR
@@ -32,15 +61,40 @@ else
 FTD2XXLDADD = -lftd2xx 
 endif
   
-if FTD2XX
+if FT2232_FTD2XX
+FTD2XXLIB = $(FTD2XXLDADD)
+else
+if PRESTO_FTD2XX
 FTD2XXLIB = $(FTD2XXLDADD)
 else
 FTD2XXLIB =
 endif
+endif
 
 openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
 	$(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
 	$(top_builddir)/src/helper/libhelper.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 \
-	$(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD)
+	$(top_builddir)/src/pld/libpld.a \
+	$(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
+
+	
+	
+nobase_dist_pkglib_DATA = \
+	tcl/commands.tcl  \
+	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/cpu/arm/arm7tdmi.tcl  \
+	tcl/cpu/arm/arm920.tcl  \
+	tcl/cpu/arm/arm946.tcl  \
+	tcl/cpu/arm/arm966.tcl  \
+	tcl/memory.tcl  \
+	tcl/mmr_helpers.tcl  \
+	tcl/readable.tcl  
+