From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 29 May 2013 11:08:59 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aee79c539713a13e4e904d2acda938d5661337e0;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  tests: avoid a spurious failure when $CC != cc
  NEWS: drop an idiomatic use of latinism 'sic'
  NEWS: fix typos and grammaros
  NEWS: fix Automake versions
  NEWS: document fix for bug#14441
  Automake::Rule: consistently prepend underscore to private variables
  Automake::Rule: rename: suffix_rule() -> next_in_suffix_chain()
  Automake::Rule: adjust comments and POD according to previous changes
  Automake::Rule: make private variables lexically scoped
  suffix rules: better distinction between builtin and user-derived
  Automake::Rule: expose suffix rules as a function, not a scalar
  tests: expose automake bug#14441

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

+ Extra non-trivial changes:

* bin/automake.in, lib/Automake/Rule.pm: Drop changes related to
user-defined source extensions, that are not supported in Automake-NG
(see section "Source Files with Unknown Extensions" in NG-NEWS for
details).
t/suffix-custom-pr14441.sh: Remove, since this script tested features
related to user-defined source.
---

aee79c539713a13e4e904d2acda938d5661337e0
diff --cc lib/Automake/Rule.pm
index 286dfbaf2,ac4b71afd..c5048a729
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@@ -93,6 -96,21 +93,8 @@@ non-object)
  
  =cut
  
 -my $_SUFFIX_RULE_PATTERN =
 -  '^(\.[a-zA-Z0-9_(){}$+@\-]+)(\.[a-zA-Z0-9_(){}$+@\-]+)' . "\$";
 -
 -my @_suffixes = ();
 -my @_known_extensions_list = ();
 -my %_rule_dict = ();
 -
 -# See comments in the implementation of the 'next_in_suffix_chain()'
 -# variable for details.
 -my %_suffix_rules;
 -
 -# Same as $suffix_rules, but records only the default rules
 -# supplied by the languages Automake supports.
 -my %_suffix_rules_builtin;
++my %_rule_dict;
+ 
  =item C<%dependencies>
  
  Holds the dependencies of targets which dependencies are factored.