This is an automated email from Gerrit. Paul Fertser ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/1476
-- gerrit commit 059dd34ba86269d063ab5d8e3ebe5bc9dcbea919 Author: Paul Fertser <[email protected]> Date: Sat Jul 6 09:12:45 2013 +0400 configure: auto-enable maintainer mode Default to --enable-maintainer-mode when building from a git repository (detect by checking .git directory presence). Change-Id: I90c8e9a86a24571019366435bd868a6799a09c45 Signed-off-by: Paul Fertser <[email protected]> diff --git a/README b/README index 14d073b..00ce989 100644 --- a/README +++ b/README @@ -205,7 +205,7 @@ 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! + NOTE: This option is auto-enabled for Git builds. It should *not* be used to build a release. --enable-dummy Enable building the dummy JTAG port driver @@ -453,9 +453,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 8a3945e..3b60fc6 100755 --- 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 6e3f986..91cdf35 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,11 @@ 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 +if test -d .git; then + AM_MAINTAINER_MODE([enable]) +else + AM_MAINTAINER_MODE +fi AC_CONFIG_HEADERS([config.h]) AH_BOTTOM([ diff --git a/doc/manual/primer/autotools.txt b/doc/manual/primer/autotools.txt index 28a4b5f..8e75058 100644 --- a/doc/manual/primer/autotools.txt +++ b/doc/manual/primer/autotools.txt @@ -55,17 +55,10 @@ 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. +When OpenOCD is being built from a git repository it enables +maintainer mode by default 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. In addition to solving these problems, this option enables Makefile rules (provided by automake) that allow the normal @c make process to -- ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
