For PR automake/492.

* automake.in (output_flag): Set to `-o' for Assembler and
preprocessed Assembler, assuming that all understand `-c -o'.
* THANKS, NEWS: Update.
* tests/subobj10.test: New test.
* tests/Makefile.am: Update.
Report by Thomas Schwinge.

diff --git a/ChangeLog b/ChangeLog
index f76c720dabf55d947ce35fca0e4e11841f8ee3b1..1ebbe98be243173c3948534c7f1f047b2c32fedf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-10-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       For PR automake/492.
+       * automake.in (output_flag): Set to `-o' for Assembler and
+       preprocessed Assembler, assuming that all understand `-c -o'.
+       * THANKS, NEWS: Update.
+       * tests/subobj10.test: New test.
+       * tests/Makefile.am: Update.
+       Report by Thomas Schwinge.
+
        * automake.in (%_macro_for_cond): New variable.
        (cond_stack_if): Use it for better error message about
        missing dependency tracking conditionals.

diff --git a/NEWS b/NEWS
index 74238d3d8cd4f9f679c7dabe5aa4d72c0f9d4475..95a15ddd584cac1d7abded5f14b3cab37d987316 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 New in 1.9c:
 
+* Languages changes:
+
+  - subdir-object mode works now with Assembler.  Automake assumes
+    that the compiler understands `-c -o'.
+
 * Miscellaneous changes:
 
   - The script `install-sh' needs to have executable permissions for

diff --git a/THANKS b/THANKS
index 19ad314e45eecb7c936c25fec669ef3e68f25a6d..2b201da2126d23111a24b0bdad5b17685eee5f16 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -277,6 +277,7 @@ Thien-Thi Nguyen    ttn@glug.org
 Thomas Fitzsimmons     fitzsim@redhat.com
 Thomas Gagne           tgagne@ix.netcom.com
 Thomas Morgan          tmorgan@pobox.com
+Thomas Schwinge                tschwinge@gnu.org
 Thomas Tanner          tanner@ffii.org
 Tim Goodwin            tjg@star.le.ac.uk
 Tim Mooney             mooney@dogbert.cc.ndsu.NoDak.edu

diff --git a/automake.in b/automake.in
index 54c3eb3049523329b26c440507809a71044ecfae..f7a0a563e7eb17411d2e048226a260d40a678158 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -840,6 +840,7 @@ register_language ('name' => 'asm',
                   'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
                   'compiler' => 'CCASCOMPILE',
                   'compile_flag' => '-c',
+                  'output_flag' => '-o',
                   'extensions' => ['.s'],
 
                   # With assembly we still use the C linker.
@@ -858,6 +859,7 @@ register_language ('name' => 'cppasm',
                   'compile' => '$(CCAS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)',
                   'compiler' => 'CPPASCOMPILE',
                   'compile_flag' => '-c',
+                  'output_flag' => '-o',
                   'extensions' => ['.S'],
 
                   # With assembly we still use the C linker.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 93a10e5ceb78352daa0a67fbc24e13a136803054..ebe9d2175ed026213375e70723e2abf6204db1f8 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -513,6 +513,7 @@ subobj6.test \
 subobj7.test \
 subobj8.test \
 subobj9.test \
+subobj10.test \
 subobjname.test \
 subpkg.test \
 subpkg2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 355314780afcbeb9260a505307c3fb3f445f0b1c..41b4e6ca74a14c63e342851e39b2895563df462c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -645,6 +645,7 @@ subobj6.test \
 subobj7.test \
 subobj8.test \
 subobj9.test \
+subobj10.test \
 subobjname.test \
 subpkg.test \
 subpkg2.test \

diff --git a/tests/subobj10.test b/tests/subobj10.test
new file mode 100755 (executable)
index 0000000..5f961db
--- /dev/null
+++ b/tests/subobj10.test
@@ -0,0 +1,60 @@
+#! /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.
+
+# PR 492: Test asm subdir-objects.
+
+required=gcc  # avoid compiler errors.
+. ./defs || exit 1
+
+set -e
+
+cat > configure.in << 'END'
+AC_INIT(x, 0, x)
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+
+AM_PROG_AS
+AC_PROG_RANLIB
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libfoo.a libbar.a
+libfoo_a_SOURCES = src/a.s b.s
+libbar_a_SOURCES = src/c.s d.s
+libbar_a_CCASFLAGS =
+END
+
+mkdir src
+: >src/a.s
+: >b.s
+: >src/c.s
+: >d.s
+
+set -e
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+$MAKE distcheck