diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-06 11:26:48 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-06 11:26:48 +0100 |
| commit | 92ed3be97837a3de1634a13959c70c686b17d38d (patch) | |
| tree | 3e675a2453cff5a777554c85c722aab685e3d346 /t/depcomp8b.sh | |
| parent | 93855f67e885ce4c16e0c71728e1ff3e6b2e64b9 (diff) | |
| parent | 08849db866b44510f6b8fd49e313c91a43a3dfd3 (diff) | |
| download | automake-92ed3be97837a3de1634a13959c70c686b17d38d.tar.gz | |
Merge branch 'deps-pr13928' into minor
* deps-pr13928:
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)
Diffstat (limited to 't/depcomp8b.sh')
| -rw-r--r-- | t/depcomp8b.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh index 8dd86a308..3f7f08244 100644 --- a/t/depcomp8b.sh +++ b/t/depcomp8b.sh @@ -48,10 +48,10 @@ $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 -grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in -grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1 +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. @@ -64,10 +64,10 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck echo AUTOMAKE_OPTIONS += subdir-objects >> Makefile.am $AUTOMAKE -grep include Makefile.in # For debugging. -grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in -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\.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. |