From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 9 Jun 2012 08:25:10 +0000 (+0200)
Subject: Merge branch 'ng/depcomp-unify-o-obj-rules' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50b2839e3a2b0e79ac126918180ef460071132bb;p=thirdparty%2Fautomake.git

Merge branch 'ng/depcomp-unify-o-obj-rules' into ng/master

* ng/depcomp-unify-o-obj-rules:
  [ng] depcomp: remove unused variable '$source' from the depcomp script
  [ng] depcomp: unify rules for '.o' and '.obj' objects
  [ng] depcomp: prefer make automatic variables over automake transforms

+ Extra non-trivial edits:

* t/libtool3.sh: Also look for the '.$(OBJEXT)' extension when grepping
the generated Makefile to ensure no explicit rules for the C compilation
has been emitted (only pattern rules should have been).
* t/subdir3.sh: Remove, since the changes done to it in the branch
'ng/depcomp-unify-o-obj-rules' have been obsoleted by the general
semantic changes done in the 'ng/subdir-objects' branch (where this
test had indeed been removed).
* t/subobj4.sh: Likewise.

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

50b2839e3a2b0e79ac126918180ef460071132bb
diff --cc t/libtool3.sh
index 5ac3b1635,2f18b150d..711581a90
--- a/t/libtool3.sh
+++ b/t/libtool3.sh
@@@ -76,8 -75,12 +76,8 @@@ $ACLOCA
  $AUTOCONF
  $AUTOMAKE --add-missing --copy
  
 -# We need explicit rules to build 1.$(OBJEXT) and a.lo.  Make sure
 -# Automake did not output additional rules for 1.lo and a.lo.
 -$FGREP '1.$(OBJEXT):' Makefile.in
 -$FGREP '1.lo:' Makefile.in && Exit 1
 -$FGREP 'a.$(OBJEXT):' Makefile.in && Exit 1
 -$FGREP 'a.lo:' Makefile.in
 +# We shouldn't need explicit rules.
- $EGREP '[^%]\.(o|obj|lo) *:' Makefile.in && Exit 1
++$EGREP '[^%]\.(o|obj|lo|\$\(OBJEXT\)) *:' Makefile.in && Exit 1
  
  ./configure
  
diff --cc t/silent-many-gcc.sh
index f6eabbed0,46d4e4571..eb00ceb2d
--- a/t/silent-many-gcc.sh
+++ b/t/silent-many-gcc.sh
@@@ -170,9 -196,9 +170,9 @@@ $FGREP am_cv_CC_dependencies_compiler_t
  $FGREP am_cv_CXX_dependencies_compiler_type configure
  # Ensure per-target rules are used, to ensure their coverage below.
  # (We do not do an exhaustive check, that wouldn't be practical).
- $FGREP 'bar-bar.o'  Makefile.in || Exit 99
 -$FGREP 'bar-bar.$(OBJEXT)' Makefile.in
 -$FGREP 'fo2-foo5.c' Makefile.in
 -$FGREP 'fo2-foo6.c' Makefile.in
++$FGREP 'bar-bar.$(OBJEXT)'  Makefile.in || Exit 99
 +$FGREP 'baz-foo5.c' Makefile.in || Exit 99
 +$FGREP 'baz-foo6.c' Makefile.in || Exit 99
  
  # Force gcc ("fast") depmode.
  depmodes="am_cv_CC_dependencies_compiler_type=gcc \
diff --cc t/silent-many-generic.sh
index a6b4a1e46,4e6c6f928..732079448
--- a/t/silent-many-generic.sh
+++ b/t/silent-many-generic.sh
@@@ -197,9 -223,9 +197,9 @@@ $AUTOCON
  
  # Ensure per-target rules are used, to ensure their coverage below.
  # (We do not do an exhaustive check, that wouldn't be practical).
- $FGREP 'bar-bar.o'  Makefile.in || Exit 99
 -$FGREP 'bar-bar.$(OBJEXT)' Makefile.in
 -$FGREP 'fo2-foo5.c' Makefile.in
 -$FGREP 'fo2-foo6.c' Makefile.in
++$FGREP 'bar-bar.$(OBJEXT)'  Makefile.in || Exit 99
 +$FGREP 'baz-foo5.c' Makefile.in || Exit 99
 +$FGREP 'baz-foo6.c' Makefile.in || Exit 99
  
  # Force dependency tracking explicitly, so that slow dependency
  # extractors are not rejected.  Try also with dependency tracking