* doc/automake.texi (Options): `no-dependencies' is similar

to `--ignore-deps', not `--include-deps'.
* m4/as.m4 (AM_PROG_AS): If `no-dependencies', do not invoke
_AM_DEPENDENCIES.
* tests/nodep2.test: New test.
* tests/Makefile.am: Adjust.

diff --git a/ChangeLog b/ChangeLog
index 9a3268c..bf10167 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-10-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * doc/automake.texi (Options): `no-dependencies' is similar
+       to `--ignore-deps', not `--include-deps'.
+       * m4/as.m4 (AM_PROG_AS): If `no-dependencies', do not invoke
+       _AM_DEPENDENCIES.
+       * tests/nodep2.test: New test.
+       * tests/Makefile.am: Adjust.
+
        * automake.in (handle_LIBOBJS_or_ALLOCA): If we are in the
        LIBOBJDIR, then we should not add a DEPDIR prefix.
        * tests/pr401.test: Update test.

diff --git a/doc/automake.texi b/doc/automake.texi
index d1df2ec..0601224 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8508,7 +8508,7 @@ This options is meaningful only when passed as an argument to
 @item @option{no-dependencies}
 @cindex Option, @option{no-dependencies}
 @opindex no-dependencies
-This is similar to using @option{--include-deps} on the command line,
+This is similar to using @option{--ignore-deps} on the command line,
 but is useful for those situations where you don't have the necessary
 bits to make automatic dependency tracking work
 (@pxref{Dependencies}).  In this case the effect is to effectively

diff --git a/m4/as.m4 b/m4/as.m4
index 26f72fd..cc8bf47 100644 (file)
--- a/m4/as.m4
+++ b/m4/as.m4
@@ -1,12 +1,12 @@
 # Figure out how to run the assembler.                      -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2006  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 4
+# serial 5
 
 # AM_PROG_AS
 # ----------
@@ -17,5 +17,5 @@ test "${CCAS+set}" = set || CCAS=$CC
 test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
 AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
 AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-_AM_DEPENDENCIES([CCAS])
+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
 ])

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 46bec2c..a6d6eb2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -372,6 +372,7 @@ nobase.test \
 nodef.test \
 nodef2.test \
 nodep.test \
+nodep2.test \
 nodepcomp.test \
 nodist.test \
 nodist2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9d3c3a2..446dec0 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -504,6 +504,7 @@ nobase.test \
 nodef.test \
 nodef2.test \
 nodep.test \
+nodep2.test \
 nodepcomp.test \
 nodist.test \
 nodist2.test \

diff --git a/tests/nodep2.test b/tests/nodep2.test
new file mode 100755 (executable)
index 0000000..133c431
--- /dev/null
+++ b/tests/nodep2.test
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2006  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., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+# Another test to make sure no-dependencies option does the right thing.
+
+. ./defs || exit 1
+
+set -e
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = a.c b.cpp c.m d.S e.java f.upc
+END
+
+cat > configure.in << 'END'
+AC_INIT([nodep2], [1], [bug-automake@gnu.org])
+AM_INIT_AUTOMAKE([no-dependencies])
+AC_CONFIG_FILES([Makefile])
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_OBJC
+AM_PROG_AS
+AM_PROG_GCJ
+AM_PROG_UPC
+AC_OUTPUT
+END
+
+: > a.c
+: > b.cpp
+: > c.m
+: > d.S
+: > e.java
+: > f.upc
+
+$ACLOCAL
+$AUTOMAKE
+
+grep DEPMODE Makefile.in && exit 1
+: