- remove requirement for file2c.tcl

[openocd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d575fbde0e896f49b69069eee7c70c7c87a1c0bc..2f1a221138a56934c05567415dc6ba672eff284e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,14 +3,13 @@ bin_PROGRAMS = openocd
 if ECOSBOARD
 MAINFILE = ecosboard.c
 else
-MAINFILE = openocd.c
+MAINFILE = main.c jim.c
 endif
 
-
-openocd_SOURCES = $(MAINFILE)
+openocd_SOURCES = $(MAINFILE) openocd.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 -I$(top_srcdir)/src/pld $(all_includes)
 
@@ -44,8 +43,12 @@ endif
 if USBPROG
 LIBUSB = -lusb
 else
+if JLINK
+LIBUSB = -lusb
+else
 LIBUSB =
 endif
+endif
 
 if IS_WIN32
 if FTD2XXDIR
@@ -67,10 +70,33 @@ FTD2XXLIB =
 endif
 endif
 
-openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
+openocd_LDADD = $(top_builddir)/src/startup.o $(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 \
        $(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  
+
+# Convert .tcl to object
+
+$(top_builddir)/src/startup.o: $(top_srcdir)/src/startup.tcl
+       ${OBJCOPY} -I binary -O ${OBJCOPY_FORMAT} -B ${OBJCOPY_ARCH} startup.tcl startup.o