Charles Hardin ckhardin at gmail.com bin2char does not need to be installed as part...

[fw/openocd] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e197382731be89cfce97cdde0844ee1c6bd8caae..75239fcc58444e1dd3592413ce7548f2ae9a3ad3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,22 +1,56 @@
 bin_PROGRAMS = openocd
-openocd_SOURCES = openocd.c
+
+if ECOSBOARD
+MAINFILE = ecosboard.c
+else
+MAINFILE = main.c jim.c
+endif
+
+openocd_SOURCES = $(MAINFILE) openocd.c startup_tcl.c
 
 # 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 $(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
+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 IS_CYGWIN
+if USBPROG
+LIBUSB = -lusb
+else
+if JLINK
+LIBUSB = -lusb
+else
+LIBUSB =
+endif
+endif
+
+if IS_WIN32
 if FTD2XXDIR
 FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib
 else
@@ -26,15 +60,47 @@ 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) 
+       $(top_builddir)/src/pld/libpld.a \
+       $(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/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  
+
+noinst_PROGRAMS = bin2char
+
+bin2char_SOURCES = bin2char.c
+
+# Convert .tcl to cfile
+startup_tcl.c: bin2char startup.tcl
+       ./bin2char startup_tcl < $(srcdir)/startup.tcl > startup_tcl.c
+
+# add startup_tcl.c to make clean list
+CLEANFILES = startup_tcl.c