[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-ng] [PATCH 3/4] [ng] deptrack: simplify by assuming more GNU m
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-ng] [PATCH 3/4] [ng] deptrack: simplify by assuming more GNU make semantics |
|
Date: |
Thu, 26 Jan 2012 14:44:22 +0100 |
GNU make supports a "laxer" variant of the 'include' directive that,
when passed non-existing files, simply ignores them instead of
complaining and erroring out. The use of this directive allows us
to simplify the code for automake dependency tracking yet a little
more.
* NG-NEWS: Update.
* automake.in (handle_single_transform): Don't try anymore to emit
explicit dependencies ensuring that each $(DEPDIR) is always created
before any compilation command that might require it. The relevant
compile rules in 'depend2.am' will take care of this directly.
(handle_languages): Use "-include", not "include", to include the
'.Po' files generated by the automatic dependency tracking support.
Don't define anymore the makefile variable 'am__depfiles_maybe',
that is now superfluous. Accordingly, ...
* lib/am/configure.am (%MAKEFILE%): ... don't pass its contents to
the 'config.status' invocation anymore.
* lib/am/depend2.am: In all the relevant compile rules, take care
of creating the $(DEPDIR) directory if it doesn't already exists.
* m4/depout.m4: Delete this file, in particular removing ...
(AM_OUTPUT_DEPENDENCY_COMMANDS, _AM_OUTPUT_DEPENDENCY_COMMANDS):
... these macros.
* doc/automake.texi (Private Macros): Remove reference to deleted
macro 'AM_OUTPUT_DEPENDENCY_COMMANDS'.
* m4/depend.m4 (_AM_DEPENDENCIES): Don't AC_REQUIRE the deleted
macro 'AM_OUTPUT_DEPENDENCY_COMMANDS' anymore.
* m4/Makefile.am (dist_automake_ac_DATA): Don't list the deleted
file 'depout.m4' anymore.
* tests/depend.test: Adjust grepping checks.
* tests/depend4.test: Likewise.
* tests/exsource.test: Likewise.
* tests/subobj11c.test: Likewise.
* tests/subobj11a.test: Adjust: we must now run "make", not only
config.status, in order to create the $(DEPDIR).
* tests/depend5.test: Remove, it's obsolete now.
* tests/depend6.test: Likewise.
* tests/postproc.test: Likewise.
* tests/pr243.test: Likewise.
* tests/pr266.test: Likewise.
* tests/list-of-tests.mk: Update.
* tests/Makefile.am (XFAIL_TESTS): Remove 'depcomp-recover.test':
this test passes now.
---
NG-NEWS | 6 ++++
automake.in | 11 +------
doc/automake.texi | 1 -
lib/am/configure.am | 6 +--
lib/am/depend2.am | 8 +++++
m4/Makefile.am | 1 -
m4/depend.m4 | 1 -
m4/depout.m4 | 73 ---------------------------------------------
tests/Makefile.am | 1 -
tests/depend.test | 2 +-
tests/depend4.test | 2 +-
tests/depend5.test | 77 ------------------------------------------------
tests/depend6.test | 45 ----------------------------
tests/exsource.test | 2 +-
tests/list-of-tests.mk | 5 ---
tests/postproc.test | 49 ------------------------------
tests/pr243.test | 58 ------------------------------------
tests/pr266.test | 47 -----------------------------
tests/subobj11a.test | 1 +
tests/subobj11c.test | 2 +-
20 files changed, 22 insertions(+), 376 deletions(-)
delete mode 100644 m4/depout.m4
delete mode 100755 tests/depend5.test
delete mode 100755 tests/depend6.test
delete mode 100755 tests/postproc.test
delete mode 100755 tests/pr243.test
delete mode 100755 tests/pr266.test
diff --git a/NG-NEWS b/NG-NEWS
index f1b0ec3..199bc79 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -14,6 +14,12 @@ Automatic dependency tracking support
the internal m4 macro 'AM_MAKE_INCLUDE' and AC_SUBST'd variables
'am__include' and 'am__quote' have been removed.
+* The makefile fragments files containing automatically computed
+ dependency information are created at make runtime by Makefile
+ recipes, not at configure time by config.status. Accordingly,
+ the special config.status argument 'depfiles' is not supported
+ anymore.
+
Silent rules
============
diff --git a/automake.in b/automake.in
index 637efca..c01575b 100644
--- a/automake.in
+++ b/automake.in
@@ -1300,7 +1300,6 @@ sub handle_languages
&define_variable ('depcomp',
"\$(SHELL) $am_config_aux_dir/depcomp",
INTERNAL);
- &define_variable ('am__depfiles_maybe', 'depfiles', INTERNAL);
require_conf_file ("$am_file.am", FOREIGN, 'depcomp');
@@ -1312,7 +1311,7 @@ sub handle_languages
$output_rules .= "\n";
foreach my $iter (@deplist)
{
- $output_rules .= subst ('AMDEP_TRUE') . "include $iter\n";
+ $output_rules .= subst ('AMDEP_TRUE') . "-include $iter\n";
}
# Compute the set of directories to remove in distclean-depend.
@@ -1325,7 +1324,6 @@ sub handle_languages
else
{
&define_variable ('depcomp', '', INTERNAL);
- &define_variable ('am__depfiles_maybe', '', INTERNAL);
}
my %done;
@@ -1921,13 +1919,6 @@ sub handle_single_transform ($$$$$%)
}
push (@dep_list, require_build_directory ($directory));
-
- # If we're generating dependencies, we also want
- # to make sure that the appropriate subdir of the
- # .deps directory is created.
- push (@dep_list,
- require_build_directory ($directory . '/$(DEPDIR)'))
- unless option 'no-dependencies';
}
&pretty_print_rule ($object . ':', "\t", @dep_list)
diff --git a/doc/automake.texi b/doc/automake.texi
index f3a3532..e587a93 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4151,7 +4151,6 @@ skip this section!
@item _AM_DEPENDENCIES
@itemx AM_SET_DEPDIR
@itemx AM_DEP_TRACK
address@hidden AM_OUTPUT_DEPENDENCY_COMMANDS
These macros are used to implement Automake's automatic dependency
tracking scheme. They are called automatically by Automake when
required, and there should be no need to invoke them manually.
diff --git a/lib/am/configure.am b/lib/am/configure.am
index 3876740..23ee7b8 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -77,10 +77,8 @@ endif %?TOPDIR_P%
?TOPDIR_P? $(SHELL) ./config.status;; \
?!TOPDIR_P? cd $(top_builddir) && $(MAKE) am--refresh;; \
*) \
-## FIXME: $(am__depfiles_maybe) lets us re-run the rule to create the
-## .P files. Ideally we wouldn't have to do this by hand.
- echo ' cd $(top_builddir) && $(SHELL) ./config.status
%CONFIG-MAKEFILE% $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE%
$(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status
%CONFIG-MAKEFILE%'; \
+ cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE%;; \
esac;
## Avoid the "deleted header file" problem for the dependencies.
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index b948a2a..7592aba 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -63,12 +63,15 @@ if %?FIRST%
?!SUBDIROBJ?am__depdir = $(DEPDIR)
## FIXME: more precise in the removal of the suffix?
am__depbase = $(am__depdir)/$(basename $(notdir $@))
+## Avoid useless forks when possible.
+am__ensure_depdir = test -d $(am__depdir) || $(MKDIR_P) $(am__depdir)
endif %?FIRST%
if %?NONLIBTOOL%
?GENERIC?%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %FASTDEP%
+ %SILENT%$(am__ensure_depdir)
## In fast-dep mode, we can always use -o.
%VERBOSE%%COMPILE% -MT $@ -MD -MP -MF $(am__depbase).Tpo %-c% -o $@ \
?GENERIC? %SOURCEFLAG%%SOURCE%
@@ -77,6 +80,7 @@ if %FASTDEP%
%SILENT%$(am__mv) $(am__depbase).Tpo $(am__depbase).Po
else !%FASTDEP%
if %AMDEP%
+ %SILENT%$(am__ensure_depdir)
%VERBOSE%source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
@@ -93,6 +97,7 @@ endif !%FASTDEP%
?GENERIC?%EXT%.obj:
?!GENERIC?%OBJOBJ%: %SOURCE%
if %FASTDEP%
+ %SILENT%$(am__ensure_depdir)
## In fast-dep mode, we can always use -o.
%VERBOSE%%COMPILE% -MT $@ -MD -MP -MF $(am__depbase).Tpo %-c% -o $@ \
?GENERIC? %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'`
@@ -104,6 +109,7 @@ if %FASTDEP%
%SILENT%$(am__mv) $(am__depbase).Tpo $(am__depbase).Po
else !%FASTDEP%
if %AMDEP%
+ %SILENT%$(am__ensure_depdir)
%VERBOSE%source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
@@ -122,6 +128,7 @@ if %?LIBTOOL%
?GENERIC?%EXT%.lo:
?!GENERIC?%LTOBJ%: %SOURCE%
if %FASTDEP%
+ %SILENT%$(am__ensure_depdir)
## In fast-dep mode, we can always use -o.
%VERBOSE%%LTCOMPILE% -MT $@ -MD -MP -MF $(am__depbase).Tpo %-c% -o $@ \
?GENERIC? %SOURCEFLAG%%SOURCE%
@@ -130,6 +137,7 @@ if %FASTDEP%
%SILENT%$(am__mv) $(am__depbase).Tpo $(am__depbase).Plo
else !%FASTDEP%
if %AMDEP%
+ %SILENT%$(am__ensure_depdir)
%VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 3c5df60..c167579 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -27,7 +27,6 @@ ccstdc.m4 \
cond.m4 \
cond-if.m4 \
depend.m4 \
-depout.m4 \
dmalloc.m4 \
gcj.m4 \
header.m4 \
diff --git a/m4/depend.m4 b/m4/depend.m4
index be9c511..a5ca9be 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -27,7 +27,6 @@
# just rely on AC_PROG_CC.
AC_DEFUN([_AM_DEPENDENCIES],
[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
diff --git a/m4/depout.m4 b/m4/depout.m4
deleted file mode 100644
index 81d8174..0000000
--- a/m4/depout.m4
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2012
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 6
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null
2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR from the Makefile without
- # running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n 's/^include \(.*(DEPDIR).*\)$/\1/p' <"$mf" \
- | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d1accee..dc16ad5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,7 +37,6 @@ TESTS = ## Will be updated later.
XFAIL_TESTS = \
all.test \
cond17.test \
-depcomp-recover.test \
gcj6.test \
override-conditional-2.test \
java-nobase.test \
diff --git a/tests/depend.test b/tests/depend.test
index 5a5e950..e77ab48 100755
--- a/tests/depend.test
+++ b/tests/depend.test
@@ -32,6 +32,6 @@ END
$ACLOCAL
$AUTOMAKE
-test 1 = `grep 'address@hidden@include ' Makefile.in | wc -l`
+test 1 = `grep 'address@hidden@-include ' Makefile.in | wc -l`
:
diff --git a/tests/depend4.test b/tests/depend4.test
index 535faf7..06cc325 100755
--- a/tests/depend4.test
+++ b/tests/depend4.test
@@ -31,7 +31,7 @@ for header in one.h two.h three.h four.h five.h six.h; do
fred_SOURCES = fred1.c $headers
END
$AUTOMAKE
- test 1 = `grep 'address@hidden@include ' Makefile.in | wc -l`
+ test 1 = `grep 'address@hidden@-include ' Makefile.in | wc -l`
done
:
diff --git a/tests/depend5.test b/tests/depend5.test
deleted file mode 100755
index 9d1bb41..0000000
--- a/tests/depend5.test
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check that _AM_OUTPUT_DEPENDENCY_COMMANDS works with eval-style
-# quoting in $CONFIG_FILES, done by newer Autoconf.
-
-required=cc
-. ./defs || Exit 1
-
-cat >>configure.in << END
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << END
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c foo.h
-END
-
-cat >foo.c << END
-#include "foo.h"
-END
-: >foo.h
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure --enable-dependency-tracking
-if test -d .deps; then
- depdir=.deps
-elif test -d _deps; then
- depdir=_deps
-else
- depdir=
-fi
-
-# For the fun of it, we should also cope with makefile
-# names that contain weird characters, with Autoconf 2.62
-# and newer.
-# Pick the first name that the file system will accept.
-for name in \
- 'weird name with $ `#() &! characters"' \
- 'weird name with $ `#() characters"' \
- 'weird name with characters'
-do
- cp Makefile.in "$name.in" && break || :
-done
-
-for arg in Makefile \
- --file=Makefile \
- "--file=$name"
-do
- rm -rf .deps _deps
- ./config.status "$arg" depfiles >stdout 2>stderr ||
- { cat stdout; cat stderr >&2; Exit 1; }
- cat stdout
- cat stderr >&2
- grep '[Nn]o such file' stderr && Exit 1
-
- if test -n "$depdir"; then
- test -d $depdir || Exit 1
- fi
-done
-:
diff --git a/tests/depend6.test b/tests/depend6.test
deleted file mode 100755
index d75a4a6..0000000
--- a/tests/depend6.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check for _AM_OUTPUT_DEPENDENCY_COMMANDS grouping bug,
-# reported by Markus Duft.
-
-. ./defs || Exit 1
-
-cat >>configure.in << END
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << END
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c foo.h
-END
-
-cat >foo.c << END
-#include "foo.h"
-END
-: >foo.h
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure --disable-dependency-tracking 2>stderr || {
- stat=$?; cat stderr >&2; Exit $stat;
-}
-cat stderr >&2
-grep shift stderr && Exit 1
-:
diff --git a/tests/exsource.test b/tests/exsource.test
index 194ce1f..8bb1eb0 100755
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -35,6 +35,6 @@ END
$ACLOCAL
$AUTOMAKE
-grep 'address@hidden@include .*/xtra\.P' Makefile.in
+grep 'address@hidden@-include .*/xtra\.P' Makefile.in
:
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index c46d1ca..a8e9a97 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -341,8 +341,6 @@ depend.test \
depend2.test \
depend3.test \
depend4.test \
-depend5.test \
-depend6.test \
deprecated-acinit.test \
destdir.test \
dirlist.test \
@@ -781,7 +779,6 @@ posixsubst-programs.test \
posixsubst-scripts.test \
posixsubst-sources.test \
posixsubst-tests.test \
-postproc.test \
ppf77.test \
pr2.test \
pr9.test \
@@ -792,8 +789,6 @@ pr211.test \
pr220.test \
pr224.test \
pr229.test \
-pr243.test \
-pr266.test \
pr279.test \
pr279-2.test \
pr287.test \
diff --git a/tests/postproc.test b/tests/postproc.test
deleted file mode 100755
index 2208d66..0000000
--- a/tests/postproc.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure we recognize a Makefile.in, even if post-processed
-# and renamed.
-
-required=cc
-. ./defs || Exit 1
-
-cat >configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_CONFIG_FILES([myMakefile])
-AC_OUTPUT
-END
-
-cat > myMakefile.am << 'END'
-bin_PROGRAMS = fred
-fred_SOURCES = fred.c
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -- myMakefile
-
-mv myMakefile.in myMakefile.old
-echo '# Post-processed by post-processor 3.14.' > myMakefile.in
-cat myMakefile.old >> myMakefile.in
-
-./configure
-
-test -f .deps/fred.Po || test -f _deps/fred.Po || Exit 1
-
-:
diff --git a/tests/pr243.test b/tests/pr243.test
deleted file mode 100755
index 2b11fb7..0000000
--- a/tests/pr243.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 243.
-# AM_OUTPUT_DEPENDENCY_COMMANDS doesn't handle
-# `Makefile:Makefile.in:tail.mk' in AC_OUTPUT.
-#
-# == Report ==
-# If configure.in has something like:
-# AC_OUTPUT(Makefile:Makefile.in:tail.mk)
-# then config.status cannot parse the Makefile to build the
-# dependency files in the .deps directory. This is because
-# the AM_OUTPUT_DEPENDENCY_COMMANDS macro cannot cope with
-# the colon in the CONFIG_FILES variable.
-
-required=cc
-. ./defs || Exit 1
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_CONFIG_FILES([Makefile:Makefile.in:tail.mk])
-AC_OUTPUT
-END
-
-: > tail.mk
-
-cat > Makefile.am << 'END'
-include_HEADERS = 3dfx.h linutil.h
-noinst_HEADERS = fx64.h fxdll.h fximg.h fxglob.h \
- fxos.h fxver.h glob.h
-noinst_PROGRAMS = fxmisc
-fxmisc_SOURCES = fx64.c fximg.c fxos.c linutil.c
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-
-test -f .deps/fx64.Po
-
-:
diff --git a/tests/pr266.test b/tests/pr266.test
deleted file mode 100755
index cff6bca..0000000
--- a/tests/pr266.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 266.
-# Dependency tracking -vs- nonstandard Makefile names
-
-required=cc
-. ./defs || Exit 1
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_CONFIG_FILES([Maudefile])
-AC_OUTPUT
-END
-
-cat > Maudefile.am << 'END'
-include_HEADERS = 3dfx.h linutil.h
-noinst_HEADERS = fx64.h fxdll.h fximg.h fxglob.h \
- fxos.h fxver.h glob.h
-noinst_PROGRAMS = fxmisc
-fxmisc_SOURCES = fx64.c fximg.c fxos.c linutil.c
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure --enable-dependency-tracking
-
-test -f .deps/fx64.Po
-
-:
diff --git a/tests/subobj11a.test b/tests/subobj11a.test
index 6ec938e..a46d961 100755
--- a/tests/subobj11a.test
+++ b/tests/subobj11a.test
@@ -63,6 +63,7 @@ $AUTOMAKE -a
./configure --enable-dependency-tracking
+$MAKE
depdir=`sed -n 's/^ *DEPDIR *= *//p' Makefile`
if test x"$depdir" != x; then
depdir=src/$depdir
diff --git a/tests/subobj11c.test b/tests/subobj11c.test
index d0f622b..a401e14 100755
--- a/tests/subobj11c.test
+++ b/tests/subobj11c.test
@@ -46,6 +46,6 @@ $AUTOMAKE -a
#
# FIXME: Are we sure this is the most sensible output in our situation?
#
-grep 'address@hidden@include [^/]*//\$(DEPDIR)/zardoz\.[^/]*$' Makefile.in
+grep 'address@hidden@-include [^/]*//\$(DEPDIR)/zardoz\.[^/]*$' Makefile.in
:
--
1.7.7.3