For PR automake/266:

	* tests/Makefile.am (TESTS): Added pr266.test.
	* tests/pr266.test: New file.
	* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Handle
	non-standard name for makefile.

diff --git a/ChangeLog b/ChangeLog
index 0711b54..70d5fae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-12-29  Tom Tromey  <tromey@redhat.com>
 
+       For PR automake/266:
+       * tests/Makefile.am (TESTS): Added pr266.test.
+       * tests/pr266.test: New file.
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Handle
+       non-standard name for makefile.
+
        For PR automake/279:
        * automake.in (conditional_ambiguous_p): New sub.
        (handle_lib_objects_cond): Use it.

diff --git a/m4/depout.m4 b/m4/depout.m4
index 470e937..e44ceb7 100644 (file)
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -23,11 +23,11 @@
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [for mf in $CONFIG_FILES; do
-  case $mf in
-  Makefile) dirpart=.;;
-  */Makefile) dirpart=`AS_DIRNAME("$mf")`;;
-  *) continue;;
-  esac
+  if (head -1 $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    dirpart=
+  fi
   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
   # Extract the definition of DEP_FILES from the Makefile without
   # running `make'.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 041cf8d..d3ffdd4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -239,6 +239,7 @@ pluseq7.test \
 pluseq8.test \
 ppf77.test \
 pr2.test \
+pr266.test \
 pr279.test \
 pr279-2.test \
 pr9.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ef7c664..e166e5c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -312,6 +312,7 @@ pluseq7.test \
 pluseq8.test \
 ppf77.test \
 pr2.test \
+pr266.test \
 pr279.test \
 pr279-2.test \
 pr9.test \

diff --git a/tests/pr266.test b/tests/pr266.test
new file mode 100755 (executable)
index 0000000..221b1a9
--- /dev/null
+++ b/tests/pr266.test
@@ -0,0 +1,29 @@
+#! /bin/sh
+
+# Test for PR 266.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(foo, 0.1, dev@null)
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_PROG_CC
+AM_CONDITIONAL(FOOTEST, false)
+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 || exit 1
+$AUTOMAKE || exit 1
+$AUTOCONF || exit 1
+./configure || exit 1
+
+test -f .deps/fx64.Po