For PR automake/385:

* lib/depcomp (makedepend): Strip any libtool call, before
running makedepends.
* tests/depcomp4.test: New file.
* tests/Makefile.am (TESTS): Add it.
Reported by Jeff Squyres.

diff --git a/ChangeLog b/ChangeLog
index b81dc4dda82dd4bc113be4c6e22fec37306d4f7b..f1aad688e4327f49bda96bc04ba7455a21c2622c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-02-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       For PR automake/385:
+       * lib/depcomp (makedepend): Strip any libtool call, before
+       running makedepends.
+       * tests/depcomp4.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       Reported by Jeff Squyres.
+
        Related to PR automake/385:
        * lib/depcomp (dashmstdout): Do not use `-o /dev/null', or gcc will
        write dependencies to /dev/null.  `-o /dev/null' was added

diff --git a/THANKS b/THANKS
index d599bce23ae6c3996e9401bdd2981d4411ee140d..a144115421cd56b1c132af7f9f5158d9dfc5ab6c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -86,6 +86,7 @@ Jason Duell           jcduell@lbl.gov
 Jason Molenda          crash@cygnus.co.jp
 Jeff Bailey            Jbailey@phn.ca
 Jeff Garzik            jgarzik@pobox.com
+Jeff Squyres           jsquyres@lam-mpi.org
 Jens Krüger            jens_krueger@physik.tu-muenchen.de
 Jeremy Nimmer          jwnimmer@alum.mit.edu
 Jerome Lovy            jlovy@multimania.com

diff --git a/lib/depcomp b/lib/depcomp
index 0f97c7aacbd87534d4e8aab8145df9d473b39913..46d3553558fe2fa72184534e1d99ccc36656370e 100755 (executable)
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -304,6 +304,13 @@ dashXmstdout)
 
 makedepend)
   "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
   # X makedepend
   shift
   cleared=no

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6eb558c3cc693bb6ec07a9d92926a65e599dead6..ef748138878c50372139dbe594e332a2a8a058c2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -138,6 +138,7 @@ depacl2.test \
 depcomp.test \
 depcomp2.test \
 depcomp3.test \
+depcomp4.test \
 depdist.test \
 depend.test \
 depend2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b122bca1986aa3dcf9a86fc55cc6af7e384c99ee..c57331e3fab8b0d6451c974767c77718cdeee5f5 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -232,6 +232,7 @@ depacl2.test \
 depcomp.test \
 depcomp2.test \
 depcomp3.test \
+depcomp4.test \
 depdist.test \
 depend.test \
 depend2.test \

diff --git a/tests/depcomp4.test b/tests/depcomp4.test
new file mode 100755 (executable)
index 0000000..ac743a7
--- /dev/null
+++ b/tests/depcomp4.test
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2003  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake 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.
+#
+# GNU Automake 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 autoconf; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Test for PR 385: makedepend doesn't work with Libtool.
+
+required='libtoolize gcc makedepend'
+. ./defs || exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LTLIBRARIES = liba.la
+liba_la_SOURCES = a.c foo.h
+
+grepdeps:
+       grep 'a.lo *:' ./$(DEPDIR)/a.Plo
+END
+
+: > foo.h
+
+cat >a.c <<EOF
+#include "foo.h"
+int a() { return 0; }
+EOF
+
+libtoolize --force
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Sanity check: make sure the cache variable we force is used by configure
+grep am_cv_CC_dependencies_compiler_type configure
+
+./configure am_cv_CC_dependencies_compiler_type=makedepend
+$MAKE >output 2>&1
+cat output
+grep 'unknown directive' output && exit 1
+$MAKE grepdeps