From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 6 Jan 2015 12:17:23 +0000 (+0100)
Subject: Merge branch 'minor'
X-Git-Tag: v1.16~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6357a630dc3cac6682a0f17b255104b4dd78f89a;p=thirdparty%2Fautomake.git

Merge branch 'minor'

* minor:
  deps: fix corner-case "make distclean" bug
  compile: don't place built object files in $(srcdir), ever ...
  tests: fix some bugs in an XFAILing test
  deps: 'subdir-object' option now works when foo_SOURCES contains $(var)
  NEWS: fix a typo

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

6357a630dc3cac6682a0f17b255104b4dd78f89a
diff --cc t/depcomp8a.sh
index cf263a560,07bbfc1fd..2190800dc
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@@ -48,13 -48,30 +48,11 @@@ int bar (void
  END
  
  $ACLOCAL
--# 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
- LC_ALL=C grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
- $EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
 -grep '\.P' Makefile.in # For debugging.
 -grep '\./\$(DEPDIR)/foo\.Po' Makefile.in
 -grep '\./\$(DEPDIR)/bar\.Po' Makefile.in
 -grep '/\./\$(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
++$AUTOMAKE -a
+ grep '\.P' Makefile.in # For debugging.
+ grep '\./\$(DEPDIR)/foo\.Po' Makefile.in
+ grep '[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.Po' Makefile.in
+ $EGREP '/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
  
  $AUTOCONF
  # Don't reject slower dependency extractors, for better coverage.
diff --cc t/depcomp8b.sh
index a7dd2bf2e,3f7f08244..ba3a68388
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@@ -41,10 -45,29 +41,12 @@@ echo 'int bar (void) { return 0; }' > s
  libtoolize
  
  $ACLOCAL
 -# FIXME: stop disabling the warnings in the 'unsupported' category
 -# FIXME: once the 'subdir-objects' option has been mandatory.
 -$AUTOMAKE -a -Wno-unsupported
 -grep '\.P' Makefile.in # For debugging.
 -grep '\./\$(DEPDIR)/foo\.Plo' Makefile.in
 -grep '\./\$(DEPDIR)/bar\.Plo' Makefile.in
 -grep '/\./\$(DEPDIR)' Makefile.in && exit 1
 -
 -$AUTOCONF
 -# Don't reject slower dependency extractors, for better coverage.
 -./configure --enable-dependency-tracking
 -$MAKE
 -DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
 -
 -# Try again with subdir-objects option.
 -
 -echo AUTOMAKE_OPTIONS += subdir-objects >> Makefile.am
 +$AUTOMAKE -a
- grep include Makefile.in # For debugging.
- LC_ALL=C grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
- $EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
+ 
 -$AUTOMAKE
+ grep '\.P' Makefile.in # For debugging.
+ grep '\./\$(DEPDIR)/foo\.Plo' Makefile.in
+ grep '[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.Plo' Makefile.in
+ $EGREP '/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
  
  $AUTOCONF
  # Don't reject slower dependency extractors, for better coverage.