From 9de357a80fee54f0fa909fcbac93bfb106e1e1a0 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 14 Oct 2006 17:26:42 +0000 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++ NEWS | 5 ++++ THANKS | 1 + automake.in | 2 ++ tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/subobj10.test | 60 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 78 insertions(+) create mode 100755 tests/subobj10.test diff --git a/ChangeLog b/ChangeLog index f76c720d..1ebbe98b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2006-10-14 Ralf Wildenhues + 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 74238d3d..95a15ddd 100644 --- 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 19ad314e..2b201da2 100644 --- 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 54c3eb30..f7a0a563 100755 --- 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 93a10e5c..ebe9d217 100644 --- 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 35531478..41b4e6ca 100644 --- 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 index 00000000..5f961dbc --- /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 -- 2.43.5