X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2FMakefile.am;h=3080839c747c3cbd15e92a98e3762e78f4239227;hp=d575fbde0e896f49b69069eee7c70c7c87a1c0bc;hb=94efc6470992bfff2308c7f10600765a56ffb8f1;hpb=54eee1b063f508278c590b435f639c25e42b5e35

diff --git a/src/Makefile.am b/src/Makefile.am
index d575fbde0e..3080839c74 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
 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
@@ -74,3 +77,22 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.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/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/memory.tcl				\
+	tcl/mmr_helpers.tcl			\
+	tcl/readable.tcl