[Openocd-svn] r1355 - branches/openocd-0.1 branches/openocd-0.1/contrib branches/openocd-0.1/doc tags/openocd-0.1.0 tags/openocd-0.1.0/contrib tags/openocd-0.1.0/doc

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

Author: kc8apf
Date: 2009-01-21 05:16:20 +0100 (Wed, 21 Jan 2009)
New Revision: 1355

Added:
   branches/openocd-0.1/contrib/openocd.udev
   tags/openocd-0.1.0/contrib/openocd.udev
Modified:
   branches/openocd-0.1/Makefile.am
   branches/openocd-0.1/configure.in
   branches/openocd-0.1/doc/openocd.texi
   tags/openocd-0.1.0/Makefile.am
   tags/openocd-0.1.0/configure.in
   tags/openocd-0.1.0/doc/openocd.texi
Log:
Merge r1351, r1352, and r1354 into 0.1.x and 0.1.0

Modified: branches/openocd-0.1/Makefile.am
===================================================================
--- branches/openocd-0.1/Makefile.am	2009-01-21 04:13:16 UTC (rev 1354)
+++ branches/openocd-0.1/Makefile.am	2009-01-21 04:16:20 UTC (rev 1355)
@@ -6,7 +6,8 @@
 	contrib/libdcc/dcc_stdio.c \
 	contrib/libdcc/dcc_stdio.h \
 	contrib/libdcc/example.c \
-	contrib/libdcc/README
+	contrib/libdcc/README \
+	contrib/openocd.udev
 
 SUBDIRS = src doc
 

Modified: branches/openocd-0.1/configure.in
===================================================================
--- branches/openocd-0.1/configure.in	2009-01-21 04:13:16 UTC (rev 1354)
+++ branches/openocd-0.1/configure.in	2009-01-21 04:16:20 UTC (rev 1355)
@@ -35,7 +35,7 @@
 
 if test $build_release = no; then
 	# check we can find guess-rev.sh
-	AC_CHECK_FILE("guess-rev.sh", build_release=no, build_release=yes)
+	AC_CHECK_FILE("$srcdir/guess-rev.sh", build_release=no, build_release=yes)
 fi
 
 # We are not *ALWAYS* being installed in the standard place.

Copied: branches/openocd-0.1/contrib/openocd.udev (from rev 1354, trunk/contrib/openocd.udev)

Modified: branches/openocd-0.1/doc/openocd.texi
===================================================================
--- branches/openocd-0.1/doc/openocd.texi	2009-01-21 04:13:16 UTC (rev 1354)
+++ branches/openocd-0.1/doc/openocd.texi	2009-01-21 04:16:20 UTC (rev 1355)
@@ -331,7 +331,12 @@
 
 @itemize @bullet
 @item
-@option{--enable-gccwarnings} - enable extra gcc warnings during build
+@option{--enable-gccwarnings} - enable extra gcc warnings during build.
+Default is enabled.
+@item
+@option{--enable-release} - enable building of a openocd release, generally
+this is for developers. It simply omits the svn version string when the
+openocd @option{-v} is executed.
 @end itemize
 
 @node JTAG Hardware Dongles

Modified: tags/openocd-0.1.0/Makefile.am
===================================================================
--- tags/openocd-0.1.0/Makefile.am	2009-01-21 04:13:16 UTC (rev 1354)
+++ tags/openocd-0.1.0/Makefile.am	2009-01-21 04:16:20 UTC (rev 1355)
@@ -6,7 +6,8 @@
 	contrib/libdcc/dcc_stdio.c \
 	contrib/libdcc/dcc_stdio.h \
 	contrib/libdcc/example.c \
-	contrib/libdcc/README
+	contrib/libdcc/README \
+	contrib/openocd.udev
 
 SUBDIRS = src doc
 

Modified: tags/openocd-0.1.0/configure.in
===================================================================
--- tags/openocd-0.1.0/configure.in	2009-01-21 04:13:16 UTC (rev 1354)
+++ tags/openocd-0.1.0/configure.in	2009-01-21 04:16:20 UTC (rev 1355)
@@ -35,7 +35,7 @@
 
 if test $build_release = no; then
 	# check we can find guess-rev.sh
-	AC_CHECK_FILE("guess-rev.sh", build_release=no, build_release=yes)
+	AC_CHECK_FILE("$srcdir/guess-rev.sh", build_release=no, build_release=yes)
 fi
 
 # We are not *ALWAYS* being installed in the standard place.

Copied: tags/openocd-0.1.0/contrib/openocd.udev (from rev 1354, trunk/contrib/openocd.udev)

Modified: tags/openocd-0.1.0/doc/openocd.texi
===================================================================
--- tags/openocd-0.1.0/doc/openocd.texi	2009-01-21 04:13:16 UTC (rev 1354)
+++ tags/openocd-0.1.0/doc/openocd.texi	2009-01-21 04:16:20 UTC (rev 1355)
@@ -331,7 +331,12 @@
 
 @itemize @bullet
 @item
-@option{--enable-gccwarnings} - enable extra gcc warnings during build
+@option{--enable-gccwarnings} - enable extra gcc warnings during build.
+Default is enabled.
+@item
+@option{--enable-release} - enable building of a openocd release, generally
+this is for developers. It simply omits the svn version string when the
+openocd @option{-v} is executed.
 @end itemize
 
 @node JTAG Hardware Dongles