X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2FMakefile.am;h=d04308e5249fa0bb5ac3c96784549a4e700e4eab;hp=1c96fb474bf58ab1027a2b03b409764d078c1f2e;hb=a28eaa85f73759bb189a46308642502c9fa5aa4b;hpb=efc6063df873b3419010ad66d183b997d52e630c;ds=sidebyside

diff --git a/src/Makefile.am b/src/Makefile.am
index 1c96fb474b..d04308e524 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,14 +3,13 @@ bin_PROGRAMS = openocd
 if ECOSBOARD
 MAINFILE = ecosboard.c
 else
-MAINFILE = main.c jim.c
+MAINFILE = main.c
 endif
 
-
-openocd_SOURCES = $(MAINFILE) openocd.c startup.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)
 
@@ -79,24 +78,22 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.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 .c file
-startup.c: $(top_srcdir)/src/startup.tcl Makefile  $(top_srcdir)/src/file2c.tcl
-	tclsh $(top_srcdir)/src/file2c.tcl $(top_srcdir)/src/startup.tcl startup.c
\ No newline at end of file
+	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