From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 16 Jan 2013 13:28:43 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c01cc63c0f9aa0c9c8e581ebafe3d1c365cb956;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  compat: restore AM_PROG_MKDIR, again
  subdir-objects: complain if it isn't enabled
  plans: update w.r.t. latest changes
  ywrap: remove an obsolete FIXME comment
  ywrap: style fixes (no semantic change intended)
  convenience: "make lint" as an alias for "make maintainer-check"
  docs: typofix in manual
  coverage: using multiple lexers in a single program
  texi: no longer support split info files

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

1c01cc63c0f9aa0c9c8e581ebafe3d1c365cb956
diff --cc automake.in
index 102182204,0473af4f7..4f10712f6
--- a/automake.in
+++ b/automake.in
@@@ -1669,10 -1782,39 +1669,9 @@@ sub handle_single_transform ($$$$$%
  		$renamed = 1;
  	    }
  
--	    # If rewrite said it was ok, put the object into a
--	    # subdir.
 -	    if ($directory ne '')
 -	    {
 -              if ($r == LANG_SUBDIR)
 -                {
 -                  $object = $directory . '/' . $object;
 -                }
 -              else
 -                {
 -                  # Since the next major version of automake (1.14) will
 -                  # make the behaviour so far only activated with the
 -                  # 'subdir-object' option mandatory, it's better if we
 -                  # start warning users not using that option.
 -                  # As suggested by Peter Johansson, we strive to avoid
 -                  # the warning when it would be irrelevant, i.e., if
 -                  # all source files sit in "current" directory.
 -                  msg_var 'unsupported', $var,
 -                          "source file '$full' is in a subdirectory,"
 -                          . "\nbut option 'subdir-objects' is disabled";
 -                  msg 'unsupported', INTERNAL, <<'EOF', uniq_scope => US_GLOBAL;
 -possible forward-incompatibility.
 -At least a source file is in a subdirectory, but the 'subdir-objects'
 -automake option hasn't been enabled.  For now, the corresponding output
 -object file(s) will be placed in the top-level directory.  However,
 -this behaviour will change in future Automake versions: they will
 -unconditionally cause object files to be placed in the same subdirectory
 -of the corresponding sources.
 -You are advised to start using 'subdir-objects' option throughout your
 -project, to avoid future incompatibilities.
 -EOF
 -                }
 -	    }
++	    # If rewrite said it was ok, put the object into a subdir.
 +	    $object = $directory . '/' . $object
 +	      unless $directory eq '';
  
  	    # If the object file has been renamed (because per-target
  	    # flags are used) we cannot compile the file with an
diff --cc maintainer/syntax-checks.mk
index 454341e34,80e4e7e74..afbba5ece
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@@ -617,3 -534,11 +617,7 @@@ sc_at_in_texi
  $(syntax_check_rules): automake aclocal
  maintainer-check: $(syntax_check_rules)
  .PHONY: maintainer-check $(syntax_check_rules)
+ 
 -## Check that the list of tests given in the Makefile is equal to the
 -## list of all test scripts in the Automake testsuite.
 -maintainer-check: maintainer-check-list-of-tests
 -
+ # I'm a lazy typist.
+ lint: maintainer-check
+ .PHONY: lint
diff --cc t/depcomp8a.sh
index aa46c4dcf,d6c73edb7..626ab8c89
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@@ -48,11 -48,29 +48,13 @@@ int bar (void
  END
  
  $ACLOCAL
- $AUTOMAKE -a
+ # FIXME: stop disabling the warnings in the 'unsupported' category
+ # FIXME: once the 'subdir-objects' option has been mandatory.
+ $AUTOMAKE -a -Wno-unsupported
  grep include Makefile.in # For debugging.
  grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
 -grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
 -grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1
  
 -$AUTOCONF
 -# Don't reject slower dependency extractors, for better coverage.
 -./configure --enable-dependency-tracking
 -$MAKE
 -cross_compiling || ./zardoz
 -DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
 -
 -# Try again with subdir-objects option.
 -
 -echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
 -
 -$AUTOMAKE
 -grep include Makefile.in # For debugging.
 -grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
 -grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
 +LC_ALL=C grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
  $EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
  
  $AUTOCONF
diff --cc t/yacc-grepping2.sh
index 8231fbf9a,3c5da2255..b00ece765
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
@@@ -40,15 -61,20 +42,17 @@@ grep '^sub/maude\.c:.*maude\.y' Makefil
  cat > Makefile.am << 'END'
  bin_PROGRAMS = maude
  maude_SOURCES = sub/maude.y
 -## A particularly trickey case.
 +## A particularly tricky case.
  maude_YFLAGS = -d
  END
+ 
 -# FIXME: stop disabling the warnings in the 'unsupported' category
 -# FIXME: once the 'subdir-objects' option has been mandatory.
 -$AUTOMAKE -a -Wno-unsupported
 +$AUTOMAKE -a
+ 
 +grep '^sub/maude-maude\.c:.*sub/maude\.y' Makefile.in
  # Rule should use maude_YFLAGS.
  grep 'AM_YFLAGS.*maude' Makefile.in && exit 1
 -
  # Silly regression.
  grep 'maudec' Makefile.in && exit 1
 -
  # Make sure the .o file is required.
  grep '^am_maude_OBJECTS.*maude' Makefile.in