From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 18 May 2013 18:28:20 +0000 (+0200)
Subject: Merge branch 'subdir-objects-work'
X-Git-Tag: v1.16~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42eaadf9b117768814796728c8bef23009d9a52a;p=thirdparty%2Fautomake.git

Merge branch 'subdir-objects-work'

* subdir-objects-work:
  depend: reduce code duplication, de-uglify make verbose output
  depend: prefer $(...) over `...` in Cygwin-specific recipes
  depend: reduce code duplication
  depend: a preparatory refactoring
  depend: refactor and remove code duplication
  Automake::Language: drop unused fields 'compile_flag' and 'output_flag'
  depend: assume '-c' compiler flag always means to produce object files
  depend: assume we can always pass '-o' to the C compiler
  cleanup: having subdir-objects mandatory allow us some simplifications
  subdir-objects: enable unconditionally
---

42eaadf9b117768814796728c8bef23009d9a52a
diff --cc t/compile_f_c_cxx.sh
index a0b0e216f,4b9189d61..4b9189d61
mode 100644,100755..100644
--- a/t/compile_f_c_cxx.sh
+++ b/t/compile_f_c_cxx.sh
diff --cc t/cscope.tap
index 9dbe01b2f,29feec228..29feec228
mode 100644,100755..100644
--- a/t/cscope.tap
+++ b/t/cscope.tap
diff --cc t/depcomp8a.sh
index d6c73edb7,4cb545b97..4cb545b97
mode 100644,100755..100644
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
diff --cc t/depcomp8b.sh
index 879ee1c0d,c06c3c17a..c06c3c17a
mode 100644,100755..100644
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
diff --cc t/fort2.sh
index d61445296,bed032368..bed032368
mode 100644,100755..100644
--- a/t/fort2.sh
+++ b/t/fort2.sh
diff --cc t/fort4.sh
index 2ef27abeb,2d01ee46d..2d01ee46d
mode 100644,100755..100644
--- a/t/fort4.sh
+++ b/t/fort4.sh
diff --cc t/fort5.sh
index 7b9991b96,d090f6ffd..d090f6ffd
mode 100644,100755..100644
--- a/t/fort5.sh
+++ b/t/fort5.sh
diff --cc t/gcj.sh
index 3de295363,3b058a5c2..3b058a5c2
mode 100644,100755..100644
--- a/t/gcj.sh
+++ b/t/gcj.sh
diff --cc t/lex-line.sh
index 258f6af56,ec9fcd3f7..ec9fcd3f7
mode 100644,100755..100644
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
diff --cc t/libobj20b.sh
index f86a46c15,70442dd17..70442dd17
mode 100644,100755..100644
--- a/t/libobj20b.sh
+++ b/t/libobj20b.sh
diff --cc t/libobj20c.sh
index 7b918021e,5f8eb688d..5f8eb688d
mode 100644,100755..100644
--- a/t/libobj20c.sh
+++ b/t/libobj20c.sh
diff --cc t/libtool3.sh
index 5653280e6,4f45a3967..4f45a3967
mode 100644,100755..100644
--- a/t/libtool3.sh
+++ b/t/libtool3.sh
diff --cc t/ltlibsrc.sh
index 8c8098bdb,04a029fe7..04a029fe7
mode 100644,100755..100644
--- a/t/ltlibsrc.sh
+++ b/t/ltlibsrc.sh
diff --cc t/pr401.sh
index 89094de75,090b2e903..090b2e903
mode 100644,100755..100644
--- a/t/pr401.sh
+++ b/t/pr401.sh
diff --cc t/pr401b.sh
index cf7a69885,f993108bb..f993108bb
mode 100644,100755..100644
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
diff --cc t/pr401c.sh
index 22e587629,eb2f4fb7b..eb2f4fb7b
mode 100644,100755..100644
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
diff --cc t/silent-nested-vars.sh
index f03204d0b,08f46fd26..08f46fd26
mode 100644,100755..100644
--- a/t/silent-nested-vars.sh
+++ b/t/silent-nested-vars.sh
diff --cc t/subobj.sh
index f595e68ad,fa0036803..fa0036803
mode 100644,100755..100644
--- a/t/subobj.sh
+++ b/t/subobj.sh
diff --cc t/subpkg-yacc.sh
index 9fc676190,1fe50a572..1fe50a572
mode 100644,100755..100644
--- a/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh
diff --cc t/subpkg.sh
index f9cdc74e2,f1e3f2b3a..f1e3f2b3a
mode 100644,100755..100644
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
diff --cc t/xsource.sh
index a3fe6e514,70dfd4e74..70dfd4e74
mode 100644,100755..100644
--- a/t/xsource.sh
+++ b/t/xsource.sh
diff --cc t/yacc-grepping2.sh
index 3c5da2255,eb4afeda1..eb4afeda1
mode 100644,100755..100644
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
diff --cc t/yacc-line.sh
index b034af36e,d0c630046..d0c630046
mode 100644,100755..100644
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh