X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2FMakefile.am;h=2f1a221138a56934c05567415dc6ba672eff284e;hp=924040e615b6fd9ea984b31310a2190990d40075;hb=2e832a399a10fc00253b342f8cde9c5b1062fa63;hpb=dc796a209113c3fdc27de0211edcaa67faed7b5f;ds=sidebyside

diff --git a/src/Makefile.am b/src/Makefile.am
index 924040e615..2f1a221138 100644
--- 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) jim.c
+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)
 
@@ -71,7 +70,7 @@ 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 \
@@ -82,7 +81,6 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
 	
 	
 nobase_dist_pkglib_DATA = \
-	tcl/commands.tcl  \
 	tcl/bitsbytes.tcl  \
 	tcl/chip/atmel/at91/aic.tcl  \
 	tcl/chip/atmel/at91/at91sam7x128.tcl  \
@@ -98,3 +96,7 @@ nobase_dist_pkglib_DATA = \
 	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