[Openocd-svn] r1334 - branches/openocd-0.1 branches/openocd-0.1/src/jtag tags/openocd-0.1.0 tags/openocd-0.1.0/src/jtag

[<kc...@ma...>]

Author: kc8apf
Date: 2009-01-17 06:40:16 +0100 (Sat, 17 Jan 2009)
New Revision: 1334

Modified:
   branches/openocd-0.1/Makefile.am
   branches/openocd-0.1/guess-rev.sh
   branches/openocd-0.1/src/jtag/Makefile.am
   tags/openocd-0.1.0/Makefile.am
   tags/openocd-0.1.0/guess-rev.sh
   tags/openocd-0.1.0/src/jtag/Makefile.am
Log:
Merge r1331-1333 into 0.1.x and 0.1.0

Modified: branches/openocd-0.1/Makefile.am
===================================================================
--- branches/openocd-0.1/Makefile.am	2009-01-16 13:28:32 UTC (rev 1333)
+++ branches/openocd-0.1/Makefile.am	2009-01-17 05:40:16 UTC (rev 1334)
@@ -2,4 +2,12 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
+EXTRA_DIST = guess-rev.sh
+
+nobase_dist_pkgdata_DATA = \
+	contrib/libdcc/dcc_stdio.c \
+	contrib/libdcc/dcc_stdio.h \
+	contrib/libdcc/example.c \
+	contrib/libdcc/README
+
 SUBDIRS = src doc

Modified: branches/openocd-0.1/guess-rev.sh
===================================================================
--- branches/openocd-0.1/guess-rev.sh	2009-01-16 13:28:32 UTC (rev 1333)
+++ branches/openocd-0.1/guess-rev.sh	2009-01-17 05:40:16 UTC (rev 1334)
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+#
 
 REV=unknown
 

Modified: branches/openocd-0.1/src/jtag/Makefile.am
===================================================================
--- branches/openocd-0.1/src/jtag/Makefile.am	2009-01-16 13:28:32 UTC (rev 1333)
+++ branches/openocd-0.1/src/jtag/Makefile.am	2009-01-17 05:40:16 UTC (rev 1334)
@@ -105,4 +105,4 @@
 libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
 	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES)
 
-noinst_HEADERS = bitbang.h jtag.h
+noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h

Modified: tags/openocd-0.1.0/Makefile.am
===================================================================
--- tags/openocd-0.1.0/Makefile.am	2009-01-16 13:28:32 UTC (rev 1333)
+++ tags/openocd-0.1.0/Makefile.am	2009-01-17 05:40:16 UTC (rev 1334)
@@ -2,4 +2,12 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
+EXTRA_DIST = guess-rev.sh
+
+nobase_dist_pkgdata_DATA = \
+	contrib/libdcc/dcc_stdio.c \
+	contrib/libdcc/dcc_stdio.h \
+	contrib/libdcc/example.c \
+	contrib/libdcc/README
+
 SUBDIRS = src doc

Modified: tags/openocd-0.1.0/guess-rev.sh
===================================================================
--- tags/openocd-0.1.0/guess-rev.sh	2009-01-16 13:28:32 UTC (rev 1333)
+++ tags/openocd-0.1.0/guess-rev.sh	2009-01-17 05:40:16 UTC (rev 1334)
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+#
 
 REV=unknown
 

Modified: tags/openocd-0.1.0/src/jtag/Makefile.am
===================================================================
--- tags/openocd-0.1.0/src/jtag/Makefile.am	2009-01-16 13:28:32 UTC (rev 1333)
+++ tags/openocd-0.1.0/src/jtag/Makefile.am	2009-01-17 05:40:16 UTC (rev 1334)
@@ -105,4 +105,4 @@
 libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
 	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES)
 
-noinst_HEADERS = bitbang.h jtag.h
+noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h