Skip to content

Commit ab90b87

Browse files
paulfertserntfreak
authored andcommitted
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 <[email protected]> Reviewed-on: http://openocd.zylin.com/1476 Tested-by: jenkins Reviewed-by: Spencer Oliver <[email protected]> Reviewed-by: Andreas Fritiofson <[email protected]>
1 parent 4501e60 commit ab90b87

File tree

4 files changed

+3
-33
lines changed

4 files changed

+3
-33
lines changed

README

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,6 @@ interfaces should be included (among other things). The following list
203203
of options was extracted from the output of './configure --help'. Other
204204
options may be available there:
205205

206-
--enable-maintainer-mode enable make rules and dependencies not useful
207-
(and sometimes confusing) to the casual installer
208-
NOTE: This option is *required* for GIT builds!
209-
It should *not* be used to build a release.
210-
211206
--enable-dummy Enable building the dummy JTAG port driver
212207

213208
--enable-parport Enable building the pc parallel port driver
@@ -453,9 +448,9 @@ Tips For Building From a GIT Repository
453448
---------------------------------------
454449

455450
Building OpenOCD from a repository requires a recent version of the GNU
456-
autotools (autoconf >= 2.59 and automake >= 1.9).
451+
autotools (autoconf >= 2.60 and automake >= 1.9).
457452

458453
1) Run './bootstrap' to create the 'configure' script and prepare
459454
the build process for your host system.
460455

461-
2) Run './configure --enable-maintainer-mode' with other options.
456+
2) Run './configure' with other options.

bootstrap

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ autoheader
3131
automake --gnu --add-missing --copy
3232
)
3333

34-
# AM_MAINTAINER_MODE requires --enable-maintainer-mode from everyone using
35-
# current source snapshots (working from GIT, or some source snapshot, etc)
36-
# otherwise the documentation will fail to build due to missing version.texi
37-
3834
if [ -n "$SKIP_SUBMODULE" ]; then
3935
echo "Skipping submodule setup"
4036
else
@@ -44,4 +40,4 @@ else
4440
fi
4541

4642
echo "Bootstrap complete. Quick build instructions:"
47-
echo "./configure --enable-maintainer-mode ...."
43+
echo "./configure ...."

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ AC_CONFIG_SRCDIR([src/openocd.c])
66
m4_include([config_subdir.m4])dnl
77

88
AM_INIT_AUTOMAKE([-Wall -Wno-portability dist-bzip2 dist-zip])
9-
AM_MAINTAINER_MODE
109

1110
AC_CONFIG_HEADERS([config.h])
1211
AH_BOTTOM([

doc/manual/primer/autotools.txt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,6 @@ The @c autoconf program generates the @c configure script from
5353
included in the project distribution packages and run by users to
5454
configure the build process for their system.
5555

56-
@subsection primermaintainermode Maintainer Mode
57-
58-
After a fresh checkout, @c bootstrap, and a simple @c configure, you may
59-
experience errors when running @c make that some files cannot be found
60-
(e.g. @c version.texi), and a second @c make will "mysteriously" solve
61-
the problems. The isssue is well-known and expected, if unfortunate.
62-
63-
The OpenOCD project requires that all developers building from the
64-
git repository use the @c --enable-maintainer-mode option when
65-
running the @c configure script. This option ensures that certain files
66-
are created during the build process that would normally be packaged in
67-
the distribution tarball. The @c bootstrap script will remind you of
68-
this requirement when it runs.
69-
70-
In addition to solving these problems, this option enables Makefile
71-
rules (provided by automake) that allow the normal @c make process to
72-
rebuild the autotools outputs, included the automake-generated Makefiles
73-
themselves. This avoids the heavy-handed approach of running the
74-
@c bootstrap script after changing one of these files.
75-
7656
@section primerautomake Automake Makefiles
7757

7858
The @c automake program generates @c Makefile.in files (from @c

0 commit comments

Comments
 (0)