From: Stefano Lattarini Date: Thu, 3 Jan 2013 14:14:26 +0000 (+0100) Subject: Merge branch 'master' into ng/master X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9bbfe9af9088bc83f50b2971fd21d2be91b9d6a;p=thirdparty%2Fautomake.git Merge branch 'master' into ng/master * master: build: don't enable 'color-tests' automake option explicitly build: enable all warnings as fatal in our own build system texi: Texinfo sources and CLEANFILES definition should co-exist peacefully tests: make two new test executable runtest: better command line API tests: move runtest.in away from the top-lever directory maint: move more maintainer files in the 'maint/' subdir tests: more significant names for some tests maint: add some of my maintainer-specific scripts texi: deprecate hack about info files in CLEANFILES variables texi: info files can be generated in the builddir Signed-off-by: Stefano Lattarini --- b9bbfe9af9088bc83f50b2971fd21d2be91b9d6a diff --cc Makefile.am index 13f419439,78aabbf4a..2ab657a50 --- a/Makefile.am +++ b/Makefile.am @@@ -60,11 -69,7 +60,9 @@@ EXTRA_DIST += $(AUTOMAKESOURCES) \ bootstrap.sh \ GNUmakefile \ - maint.mk \ - syntax-checks.mk \ - HACKING + HACKING \ + NG-NEWS \ + $(gitlog_to_changelog_fixes) # Make versioned links. We only run the transform on the root name; # then we make a versioned link with the transformed base name. This @@@ -452,12 -442,14 +450,12 @@@ EXTRA_DIST += t/ax/shell-no-trail-bslas CLEANFILES += t/ax/shell-no-trail-bslash noinst_SCRIPTS += t/ax/shell-no-trail-bslash - runtest: runtest.in Makefile + runtest: t/ax/runtest.in Makefile $(AM_V_at)rm -f $@ $@-t - $(AM_V_GEN)in=t/ax/runtest.in \ - && $(MKDIR_P) t/ax \ - && $(do_subst) <$(srcdir)/$$in >$@-t \ - && chmod a+x $@-t + $(AM_V_GEN)$(do_subst) + $(AM_V_at)chmod a+x $@-t $(generated_file_finalize) - EXTRA_DIST += runtest.in + EXTRA_DIST += t/ax/runtest.in CLEANFILES += runtest noinst_SCRIPTS += runtest @@@ -658,5 -663,25 +656,16 @@@ EXTRA_DIST += ## --------------------------------------------------- ## EXTRA_DIST += \ - old/ChangeLog-tests \ - old/ChangeLog.96 \ - old/ChangeLog.98 \ - old/ChangeLog.00 \ - old/ChangeLog.01 \ - old/ChangeLog.02 \ - old/ChangeLog.03 \ - old/ChangeLog.04 \ - old/ChangeLog.09 \ - old/ChangeLog.11 \ - old/TODO + $(addprefix old/ChangeLog., 96 98 00 01 02 03 04 09 11) \ + old/ChangeLog-tests old/TODO + + ## ---------------------------------------- ## + ## Maintainer-specific files and scripts. ## + ## ---------------------------------------- ## + + EXTRA_DIST += \ + maint/am-ft \ + maint/am-xft \ + maint/rename-tests \ + maint/maint.mk \ + maint/syntax-checks.mk diff --cc automake.in index 2bb3e1f60,d2e12a953..2649d3a56 --- a/automake.in +++ b/automake.in @@@ -2895,8 -3362,10 +2922,8 @@@ EO new Automake::Location, TEXI => $texi, VTI => $vti, - STAMPVTI => "${soutdir}stamp-$vti", - VTEXI => "$soutdir$vtexi"); + STAMPVTI => "${outdir}stamp-$vti", - VTEXI => "$outdir$vtexi", - MDDIR => $conf_dir, - DIRSTAMP => $dirstamp); ++ VTEXI => "$outdir$vtexi"); } } diff --cc bootstrap.sh index 9a1b668ca,7704fc11e..580143629 --- a/bootstrap.sh +++ b/bootstrap.sh @@@ -98,16 -100,17 +98,17 @@@ dosubst m4/amversion.in m4/amversion.m dosubst automake.in automake.tmp # Create required makefile snippets. -$PERL ./gen-testsuite-part > t/testsuite-part.tmp -chmod a-w t/testsuite-part.tmp -mv -f t/testsuite-part.tmp t/testsuite-part.am +$PERL ./gen-testsuite-part > testsuite-autodeps.tmp +chmod a-w testsuite-autodeps.tmp +mv -f testsuite-autodeps.tmp testsuite-autodeps.am - # Run the autotools. + # Run the autotools. Bail out if any warning is triggered. # Use '-I' here so that our own *.m4 files in m4/ gets included, # not copied, in aclocal.m4. - $PERL ./aclocal.tmp -I m4 --automake-acdir m4 --system-acdir m4/acdir - $AUTOCONF - $PERL ./automake.tmp + $PERL ./aclocal.tmp -Wall -Werror -I m4 \ + --automake-acdir=m4 --system-acdir=m4/acdir + $AUTOCONF -Wall -Werror + $PERL ./automake.tmp -Wall -Werror # Remove temporary files and directories. rm -rf aclocal-$APIVERSION automake-$APIVERSION diff --cc configure.ac index 4fbbf8297,f066e34bf..f05d39275 --- a/configure.ac +++ b/configure.ac @@@ -39,7 -39,8 +39,8 @@@ AC_SUBST([am_AUTOUPDATE], ["${AUTOUPDAT dnl We call AC_PROG_CC in an unusual way, and only for use in our dnl testsuite, so also use 'no-dependencies' and 'no-define' among dnl the automake options to avoid bloating and potential problems. - AM_INIT_AUTOMAKE([filename-length-max=99 ng no-define no-dependencies]) -AM_INIT_AUTOMAKE([-Wall -Werror dist-xz filename-length-max=99 ++AM_INIT_AUTOMAKE([ng -Wall -Werror filename-length-max=99 + no-define no-dependencies]) ## Keep this on a line of its own, since it must be found and processed ## by the 'update-copyright' rule in our Makefile. diff --cc doc/automake-ng.texi index a67457398,b1e3a8c75..69178c2d3 --- a/doc/automake-ng.texi +++ b/doc/automake-ng.texi @@@ -9970,15 -10046,14 +9975,23 @@@ options below. This option should be u @file{configure.ac}, it will be ignored otherwise. It will also be ignored in sub-packages of nested packages (@pxref{Subpackages}). + @item @option{info-in-builddir} + @cindex Option, @option{info-in-builddir} + @opindex info-in-builddir + Instruct Automake to place the generated @file{.info} files in the + @code{builddir} rather than in the @code{srcdir}. Note that this + might make VPATH builds with some non-GNU make implementations more + brittle. + +@item @option{ng} +@cindex Option, @option{ng} +@opindex ng +This is a no-op option, whose only purpose it to be recognized by +Automake-NG but @emph{not} by mainstream Automake. It can be +used by developers to declare that their build system requires +Automake-NG, and in a way that will ensure a clear error if +mainstream Automake is used by mistake. + @item @option{no-define} @cindex Option, @option{no-define} @opindex no-define diff --cc lib/Automake/Options.pm index 49a307f6a,39327981a..8782c790e --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@@ -270,7 -270,13 +270,8 @@@ sub _is_valid_easy_option ($ check-news color-tests dejagnu - dist-bzip2 - dist-lzip - dist-shar - dist-tarZ - dist-xz - dist-zip + info-in-builddir + ng no-define no-dependencies no-dist diff --cc t/backslash-issues.sh index 6b0a9a198,9dae7155a..6b0a9a198 mode 100644,100755..100755 --- a/t/backslash-issues.sh +++ b/t/backslash-issues.sh