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
on 2002-06-13 just because I tried to replace `-o foo.o' by something
else and didn't thought about removing it entirely.
* tests/depcomp3.test: New file.
* tests/Makefile.am (TESTS): Add it.

diff --git a/ChangeLog b/ChangeLog
index 478dedaa758f6140d2bc623c5266ad53af887949..b81dc4dda82dd4bc113be4c6e22fec37306d4f7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-02-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       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
+       on 2002-06-13 just because I tried to replace `-o foo.o' by something
+       else and didn't thought about removing it entirely.
+       * tests/depcomp3.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
        * automake.in (BEGIN): Override $ENV{'SHELL'} with ./configure's
        SHELL for DJGPP.
        Suggested by Richard Dawe.

diff --git a/lib/depcomp b/lib/depcomp
index 807b991f4a895431dfc232112e77b0ae7e3d5017..0f97c7aacbd87534d4e8aab8145df9d473b39913 100755 (executable)
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -265,9 +265,7 @@ dashmstdout)
     shift
   fi
 
-  # Remove `-o $object'.  We will use -o /dev/null later,
-  # however we can't do the remplacement now because
-  # `-o $object' might simply not be used
+  # Remove `-o $object'.
   IFS=" "
   for arg
   do
@@ -287,7 +285,7 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[      ]*:'"$object"'\: :' > "$tmpdepfile"
+  "$@" $dashmflag | sed 's:^[^:]*\:[   ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   tr ' ' '

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

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

diff --git a/tests/depcomp3.test b/tests/depcomp3.test
new file mode 100755 (executable)
index 0000000..8c63494
--- /dev/null
+++ b/tests/depcomp3.test
@@ -0,0 +1,66 @@
+#! /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 Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Make sure dashmstdout generates dependencies.
+
+required='gcc'
+. ./defs || exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+check_PROGRAMS = prg
+prg_SOURCES = src/sub.c src/foo.h
+
+grepdeps:
+       grep 'src/sub.$(OBJEXT).*:' src/$(DEPDIR)/sub.Po
+
+END
+
+mkdir src
+
+touch src/foo.h
+
+cat >src/sub.c <<EOF
+#include "foo.h"
+int
+main ()
+{
+   return 0;
+}
+EOF
+
+$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=dashmstdout
+$MAKE check
+$MAKE grepdeps