[Openocd-svn] r2435 - trunk

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-30 23:44:48 +0200 (Tue, 30 Jun 2009)
New Revision: 2435

Removed:
   trunk/INSTALL
Modified:
   trunk/Makefile.am
   trunk/bootstrap
Log:
Switch automake handling to use --gnu mode, not --foreign.
Remove INSTALL file; automake generates a copy of the latest version.


Deleted: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2009-06-30 21:13:53 UTC (rev 2434)
+++ trunk/INSTALL	2009-06-30 21:44:48 UTC (rev 2435)
@@ -1 +0,0 @@
-openocd.texi is the authoritative source of OpenOCD documentation

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-06-30 21:13:53 UTC (rev 2434)
+++ trunk/Makefile.am	2009-06-30 21:44:48 UTC (rev 2435)
@@ -1,6 +1,6 @@
 # not a GNU package. You can remove this line, if
 # have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 1.6
+AUTOMAKE_OPTIONS = gnu 1.6
 
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
@@ -34,7 +34,7 @@
 
 TCL_PATH = tcl
 # command to find paths of script files, relative to TCL_PATH
-TCL_FILES := find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
+TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
 		sed -e 's,^$(srcdir)/$(TCL_PATH),,'
 
 dist-hook:
@@ -61,6 +61,7 @@
 DISTCLEANFILES = doxygen.log
 
 MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
 	$(srcdir)/configure \
 	$(srcdir)/Makefile.in \
 	$(srcdir)/depcomp \

Modified: trunk/bootstrap
===================================================================
--- trunk/bootstrap	2009-06-30 21:13:53 UTC (rev 2434)
+++ trunk/bootstrap	2009-06-30 21:44:48 UTC (rev 2435)
@@ -17,7 +17,7 @@
 ${libtoolize} --automake --copy
 autoconf
 autoheader
-automake --foreign --add-missing --copy
+automake --gnu --add-missing --copy
 )
 
 # AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode