X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=Makefile.am;h=dc4166d16c6634a3042e6d444b2599c43e0c1f45;hp=52ba595ead513de0d8269289defa7dff584832c1;hb=f86137066a6b42c46c457c9837a8015990bf71e6;hpb=00228aa8398fd7dde1271af424fab1cb470c5f43

diff --git a/Makefile.am b/Makefile.am
index 52ba595ead..dc4166d16c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
@@ -15,6 +15,9 @@ EXTRA_DIST = \
 	Doxyfile.in \
 	tools/logger.pl
 
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status --recheck
+
 docs: pdf html doxygen
 
 Doxyfile: $(srcdir)/Doxyfile.in
@@ -31,7 +34,7 @@ doxygen::
 
 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:
@@ -58,6 +61,7 @@ distclean-local:
 DISTCLEANFILES = doxygen.log
 
 MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
 	$(srcdir)/configure \
 	$(srcdir)/Makefile.in \
 	$(srcdir)/depcomp \