configure: remove AM_MAINTAINER_MODE, effectively always enabling all the rules

There're strong arguments against using this macro (mostly regarding
build consistency), so remove it altogether.

Change-Id: I90c8e9a86a24571019366435bd868a6799a09c45
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/1476
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>

diff --git a/README b/README
index 14d073b6d2575b525a8f00c3fad3df9d2ed43acb..d1b983d76aebea4cfbc8391f764f28496cf42c1d 100644 (file)
--- a/README
+++ b/README
@@ -203,11 +203,6 @@ interfaces should be included (among other things).  The following list
 of options was extracted from the output of './configure --help'.  Other
 options may be available there:
 
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer
-                         NOTE: This option is *required* for GIT builds!
-                         It should *not* be used to build a release.
-
   --enable-dummy          Enable building the dummy JTAG port driver
 
   --enable-parport        Enable building the pc parallel port driver
@@ -453,9 +448,9 @@ Tips For Building From a GIT Repository
 ---------------------------------------
 
 Building OpenOCD from a repository requires a recent version of the GNU
-autotools (autoconf >= 2.59 and automake >= 1.9).
+autotools (autoconf >= 2.60 and automake >= 1.9).
 
 1) Run './bootstrap' to create the 'configure' script and prepare
    the build process for your host system.
 
-2) Run './configure --enable-maintainer-mode' with other options.
+2) Run './configure' with other options.

diff --git a/bootstrap b/bootstrap
index 8a3945e8f78724dbc30b08cf19965e4e64d6486a..3b60fc6e5d1f5f2ce9a271ab679a331bdfd55690 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -31,10 +31,6 @@ autoheader
 automake --gnu --add-missing --copy
 )
 
-# AM_MAINTAINER_MODE requires --enable-maintainer-mode from everyone using
-# current source snapshots (working from GIT, or some source snapshot, etc)
-# otherwise the documentation will fail to build due to missing version.texi
-
 if [ -n "$SKIP_SUBMODULE" ]; then
     echo "Skipping submodule setup"
 else
@@ -44,4 +40,4 @@ else
 fi
 
 echo "Bootstrap complete. Quick build instructions:"
-echo "./configure --enable-maintainer-mode ...."
+echo "./configure ...."

diff --git a/configure.ac b/configure.ac
index 87f95d5dd19486d23940bdfc087e94f51d53d9eb..2998ec79f05960fb74697845882ab15217539004 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,6 @@ AC_CONFIG_SRCDIR([src/openocd.c])
 m4_include([config_subdir.m4])dnl
 
 AM_INIT_AUTOMAKE([-Wall -Wno-portability dist-bzip2 dist-zip])
-AM_MAINTAINER_MODE
 
 AC_CONFIG_HEADERS([config.h])
 AH_BOTTOM([

diff --git a/doc/manual/primer/autotools.txt b/doc/manual/primer/autotools.txt
index 28a4b5f6613298194154c390ae63816c4da89500..9d9aada105d75074c112311b617d1b4053db7f9a 100644 (file)
--- a/doc/manual/primer/autotools.txt
+++ b/doc/manual/primer/autotools.txt
@@ -53,26 +53,6 @@ The @c autoconf program generates the @c configure script from
 included in the project distribution packages and run by users to
 configure the build process for their system.
 
-@subsection primermaintainermode Maintainer Mode
-
-After a fresh checkout, @c bootstrap, and a simple @c configure, you may
-experience errors when running @c make that some files cannot be found
-(e.g. @c version.texi), and a second @c make will "mysteriously" solve
-the problems.  The isssue is well-known and expected, if unfortunate.
-
-The OpenOCD project requires that all developers building from  the
-git repository use the @c --enable-maintainer-mode option when
-running the @c configure script.  This option ensures that certain files
-are created during the build process that would normally be packaged in
-the distribution tarball.  The @c bootstrap script will remind you of
-this requirement when it runs.
-
-In addition to solving these problems, this option enables Makefile
-rules (provided by automake) that allow the normal @c make process to
-rebuild the autotools outputs, included the automake-generated Makefiles
-themselves.  This avoids the heavy-handed approach of running the
-@c bootstrap script after changing one of these files.
-
 @section primerautomake Automake Makefiles
 
 The @c automake program generates @c Makefile.in files (from @c