From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 6 Jan 2015 21:03:06 +0000 (+0100)
Subject: Merge branch 'master' into ng/master (bug#13928 fixed by this)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f3a565e9a708298be5e6fa136210c3ef4f5163d;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master (bug#13928 fixed by this)

Part of this merge is actually a no-op, since we had already fixed
Automake-NG so that the 'subdir-object' option (enabled by default)
would work when foo_SOURCES contains $(var).

OTOH, even Automake-NG suffered of the bug where built object files,
as well as dependency-tracking makefile fragments, could be placed
in $(srcdir) when a source file was specified as '$(srdir)/foo.c' or
'$(top_srcdir)/bar.c'. See bug#16375 and bug#15293.

* master:
  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>
---

8f3a565e9a708298be5e6fa136210c3ef4f5163d
diff --cc t/Makefile.inc
index 15f0a523b,6ced9266b..c3e72fc7e
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@@ -35,71 -35,9 +35,70 @@@ AM_TAP_LOG_DRIVER_FLAGS = --merg
  EXTRA_DIST += %D%/README %D%/ax/is %D%/ax/is_newest %D%/ax/deltree.pl
  
  
 -## Will be updated later.
 -TESTS =
 +# Hand-written tests for stuff in 'contrib/'.
 +include $(srcdir)/contrib/%D%/Makefile.inc
  
 +# All tests, both hand-written and autogenerated.
 +# IMPORTANT: This assumes that the autogenerated tests are placed
 +#            in the $(srcdir) as well!
 +all_TESTS = \
 +  $(wildcard $(srcdir)/%D%/*.sh) \
 +  $(wildcard $(srcdir)/%D%/*.tap) \
 +  $(wildcard $(srcdir)/%D%/pm/*.pl)
 +
 +# This is to ensure longer-running tests will be run earlier, which is
 +# useful when running the testsuite in parallel on multicore machines.
 +# Here too we assume that the autogenerated tests are placed in $(srcdir).
 +long_running_TESTS = \
 +  $(srcdir)/%D%/dist-many.sh \
 +  $(srcdir)/%D%/parallel-tests-many.sh \
 +  $(srcdir)/%D%/add-missing.tap \
 +  $(srcdir)/%D%/instspc.tap \
 +  $(wildcard $(srcdir)/%D%/depcomp-*.tap) \
 +  $(wildcard $(srcdir)/%D%/*libtool*.sh) \
 +  $(wildcard $(srcdir)/%D%/lt*.sh) \
 +  $(wildcard $(srcdir)/%D%/remake*.sh)
 +
 +TESTS = \
 +  $(long_running_TESTS) \
 +  $(filter-out $(long_running_TESTS), $(all_TESTS)) \
 +  $(contrib_TESTS)
 +
 +EXTRA_DIST += $(TESTS)
 +
 +# FIXME: this "expected failures" are in truth an hack used to
 +# FIXME: to verify that some incorrect usages of our perl libraries
 +# FIXME: raise an error.  We should find a cleaner way to check that.
 +perl_fake_XFAIL_TESTS = \
 +  %D%/pm/Cond2.pl \
 +  %D%/pm/Cond3.pl \
 +  %D%/pm/DisjCon2.pl \
 +  %D%/pm/DisjCon3.pl \
 +  %D%/pm/Version2.pl \
 +  %D%/pm/Version3.pl
 +
 +XFAIL_TESTS = \
 +  %D%/all.sh \
 +  %D%/auxdir-pr19311.sh \
 +  %D%/override-suggest-local.sh \
 +  %D%/comments-in-var-def.sh \
 +  %D%/cond17.sh \
 +  %D%/dist-srcdir2.sh \
 +  %D%/gcj6.sh \
 +  %D%/txinfo-nodist-info.sh \
 +  %D%/override-conditional-2.sh \
 +  %D%/dist-pr109765.sh \
 +  %D%/instdir-cond2.sh \
 +  %D%/interp3.sh \
 +  %D%/java-nobase.sh \
 +  %D%/objext-pr10128.sh \
 +  %D%/override-conditional-pr13940.sh \
 +  %D%/remake-timing-bug-pr8365.sh \
 +  %D%/remake-am-pr10111.sh \
 +  %D%/remake-m4-pr10111.sh \
-   %D%/subobj-vpath-pr13928.sh \
 +  %D%/var-undef-append.sh \
 +  $(perl_fake_XFAIL_TESTS)
 + 
  # Some testsuite-influential variables should be overridable from the
  # test scripts, but not from the environment.
  # Keep this in sync with the similar list in ax/runtest.in.
diff --cc t/lex-depend-cxx.sh
index 5412e9c9f,79a2f3b77..3e2821f1d
--- a/t/lex-depend-cxx.sh
+++ b/t/lex-depend-cxx.sh
@@@ -82,8 -82,13 +82,14 @@@ $AUTOCON
  # using slow dependency extractors.
  ./configure --enable-dependency-tracking
  
 +$MAKE
++
+ # For debugging.
+ for f in $(find . -name '*.Po'); do
+   cat $f
+ done
+ 
  $MAKE test-deps-exist
 -$MAKE
  
  $sleep
  touch my-hdr.hxx