[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1-344-gf6ce19b |
|
Date: |
Sun, 10 Jun 2012 12:18:14 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=f6ce19bd6374fef13304eacce9dc7f684b579aec
The branch, ng/master has been updated
via f6ce19bd6374fef13304eacce9dc7f684b579aec (commit)
via ff30f8382b743b09cd97306febfc025b10add26c (commit)
from 4b0da105a773fd4f34bf3298780b1c18d7de3194 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f6ce19bd6374fef13304eacce9dc7f684b579aec
Author: Stefano Lattarini <address@hidden>
Date: Sun Jun 10 14:12:55 2012 +0200
[ng] cosmetics: remove trailing whitespace from few files
Signed-off-by: Stefano Lattarini <address@hidden>
commit ff30f8382b743b09cd97306febfc025b10add26c
Author: Stefano Lattarini <address@hidden>
Date: Sat Jun 9 20:49:09 2012 +0200
[ng] tests: merge, tweak and modernize few test scripts
* t/specflg.sh, t/specflg2.sh, t/specflg3.sh: Merged into ...
* t/per-target-flags.sh: ... this test.
* t/fo.sh: Remove, its weak grepping checks well superseded by
the semantic checks in 't/fort4.sh'.
* t/cxxo.sh: Remove, its weak grepping checks well superseded
by the semantic checks in 't/cxx-demo.sh'.
* t/cxxcpp.sh: Enhance a little.
* t/empty.sh: Renamed ...
* t/empty-data-primary.sh: ... to this. Add trailing ':' command.
* t/empty2.sh, t/empty3.sh, t/empty4.sh: Merged ...
* t/empty-sources-primary.tap: ... into this new test.
* t/no-outdir-option.sh: Remove. A test to check than an obsolete
and now deleted option ("--output-dir") stays deleted is way too
much even for the most test-infected person ;-)
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
NG-NEWS | 4 +-
automake.in | 4 +-
t/cxxcpp.sh | 4 +-
t/cxxo.sh | 34 ----------
t/distcheck-override-infodir.sh | 2 +-
t/{empty.sh => empty-data-primary.sh} | 2 +
t/{empty4.sh => empty-sources-primary.tap} | 27 ++++++--
t/empty2.sh | 36 ----------
t/empty3.sh | 34 ----------
t/fo.sh | 36 ----------
t/insthook.sh | 2 +-
t/mmodely.sh | 2 +-
t/no-outdir-option.sh | 29 --------
t/objc-flags.sh | 2 +-
t/objcxx-flags.sh | 2 +-
t/parallel-tests2.sh | 2 +-
t/per-target-flags.sh | 96 ++++++++++++++++++++++++++++
t/perf/testsuite-summary.sh | 2 +-
t/silent2.sh | 2 +-
t/silentcxx.sh | 2 +-
t/specflg.sh | 53 ---------------
t/specflg2.sh | 62 ------------------
t/specflg3.sh | 43 ------------
t/suffix-custom-subobj.sh | 2 +-
t/suffix-obj.sh | 2 +-
t/txinfo21b.sh | 2 +-
t/yacc-dist-nobuild-subdir.sh | 2 +-
27 files changed, 137 insertions(+), 353 deletions(-)
delete mode 100755 t/cxxo.sh
rename t/{empty.sh => empty-data-primary.sh} (99%)
rename t/{empty4.sh => empty-sources-primary.tap} (63%)
delete mode 100755 t/empty2.sh
delete mode 100755 t/empty3.sh
delete mode 100755 t/fo.sh
delete mode 100755 t/no-outdir-option.sh
create mode 100755 t/per-target-flags.sh
delete mode 100755 t/specflg.sh
delete mode 100755 t/specflg2.sh
delete mode 100755 t/specflg3.sh
diff --git a/NG-NEWS b/NG-NEWS
index 4d5431d..16d0074 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -3,7 +3,7 @@ Automake and Automake-NG. Be aware that there is likely a
plethora
of other minor differences and incompatibilities *not* listed here.
-Automatic dependency tracking support
+Automatic dependency tracking support
=====================================
* The generated Makefile.in files use "-include", not "include", to
@@ -274,7 +274,7 @@ Source Files with Unknown Extensions
file, and appending either '.$(OBJEXT)' or '.lo' to it (which one depends
on whether the object is built as part of a program, a static library, or
a libtool library). It will then be assumed that the user has defined a
- rule (either explicit or defined from a pattern rule) which can turn that
+ rule (either explicit or defined from a pattern rule) which can turn that
source file into this corresponding object file. For example, on an
input like:
diff --git a/automake.in b/automake.in
index 0b4cf24..ce3cd6e 100644
--- a/automake.in
+++ b/automake.in
@@ -877,7 +877,7 @@ register_language ('name' => 'asm',
'config_vars' => ['CCAS', 'CCASFLAGS'],
'flags' => ['CCASFLAGS'],
- # Users can set AM_CCASFLAGS to include, say, DEFS,
+ # Users can set AM_CCASFLAGS to include, say, DEFS,
# or anything else required. They can also set CCAS.
# Or simply use Preprocessed Assembler.
'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
@@ -7275,7 +7275,7 @@ sub generate_makefile ($$)
# See if any _SOURCES (or _LIBADD, or ...) variable were misspelled.
$output_checks .= preprocess_file ("$libdir/am/check-typos.am");
# Report errors (if any) seen at make runtime.
- $output_checks .= '$(if $(am__seen_error),' .
+ $output_checks .= '$(if $(am__seen_error),' .
'$(error Some Automake-NG error occurred))' .
"\n";
diff --git a/t/cxxcpp.sh b/t/cxxcpp.sh
index cc69163..2eaefad 100755
--- a/t/cxxcpp.sh
+++ b/t/cxxcpp.sh
@@ -27,4 +27,6 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^CXXCPP' Makefile.in
+grep '^CXXCPP =' Makefile.in
+
+:
diff --git a/t/cxxo.sh b/t/cxxo.sh
deleted file mode 100755
index a754701..0000000
--- a/t/cxxo.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This program 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.
-#
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure C++ files are rewritten to ".o" and not just "o".
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_PROG_CXX
-END
-
-cat > Makefile.am << 'END'
-sbin_PROGRAMS = anonymous
-anonymous_SOURCES = doe.C
-END
-
-: > doe.C
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh
index a9f3f91..71543c9 100755
--- a/t/distcheck-override-infodir.sh
+++ b/t/distcheck-override-infodir.sh
@@ -55,7 +55,7 @@ $AUTOCONF
$MAKE
$MAKE distcheck
-$MAKE distcheck infodir="`pwd`"/_info
+$MAKE distcheck infodir="`pwd`"/_info
test -f _info/dir || Exit 99 # Sanity check.
:
diff --git a/t/empty.sh b/t/empty-data-primary.sh
similarity index 99%
rename from t/empty.sh
rename to t/empty-data-primary.sh
index 795f922..368b556 100755
--- a/t/empty.sh
+++ b/t/empty-data-primary.sh
@@ -27,3 +27,5 @@ $AUTOCONF
$AUTOMAKE
./configure --prefix "`pwd`/inst"
$MAKE install
+
+:
diff --git a/t/empty4.sh b/t/empty-sources-primary.tap
similarity index 63%
rename from t/empty4.sh
rename to t/empty-sources-primary.tap
index 8106426..87f5348 100755
--- a/t/empty4.sh
+++ b/t/empty-sources-primary.tap
@@ -14,25 +14,36 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure empty _SOURCES works.
-# From Paul Berrevoets.
+# A test for missing _SOURCES variable. Also test to make sure empty
+# _SOURCES suppresses assumption about default name.
. ./defs || Exit 1
+plan_ 5
+
cat >> configure.ac << 'END'
AC_PROG_CC
-AC_SUBST(ZOO_OBJ)
+AC_SUBST([zoo_obj])
END
cat > Makefile.am << 'END'
+sbin_PROGRAMS = pavel
+
+bin_PROGRAMS = pavel2
+pavel2_SOURCES =
+
noinst_PROGRAMS = zoo
zoo_SOURCES =
EXTRA_zoo_SOURCES = bar.c foo.c
-zoo_DEPENDENCIES = $(ZOO_OBJ)
+zoo_DEPENDENCIES = $(zoo_obj)
zoo_LDADD = $(zoo_DEPENDENCIES)
END
-$ACLOCAL
-$AUTOMAKE
-$FGREP zoo. Makefile.in && Exit 1
-Exit 0
+command_ok_ "aclocal" $ACLOCAL
+command_ok_ "automake" $AUTOMAKE
+
+command_ok_ "default _SOURCES" $FGREP ' pavel.c' Makefile.in
+command_ok_ "empty _SOURCES (basic)" not $FGREP 'pavel2.' Makefile.in
+command_ok_ "empty _SOURCES (elaborate)" not $FGREP 'zoo.' Makefile.in
+
+:
diff --git a/t/empty2.sh b/t/empty2.sh
deleted file mode 100755
index 224c26d..0000000
--- a/t/empty2.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This program 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.
-#
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure empty _SOURCES suppresses assumption about default
-# name. Report from Pavel Roskin.
-
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = pavel
-pavel_SOURCES =
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'pavel\.' Makefile.in && Exit 1
-
-:
diff --git a/t/empty3.sh b/t/empty3.sh
deleted file mode 100755
index 4721db5..0000000
--- a/t/empty3.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This program 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.
-#
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-# A test for missing _SOURCES variable.
-
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = pavel
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP ' pavel.c' Makefile.in
-
-:
diff --git a/t/fo.sh b/t/fo.sh
deleted file mode 100755
index 50b4f4a..0000000
--- a/t/fo.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998-2012 Free Software Foundation, Inc.
-#
-# This program 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.
-#
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Fortran 77 files are rewritten to ".o" and not just "o".
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_PROG_F77
-END
-
-cat > Makefile.am << 'END'
-sbin_PROGRAMS = anonymous
-anonymous_SOURCES = doe.f
-END
-
-: > doe.f
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/t/insthook.sh b/t/insthook.sh
index 0feba5c..04a5ff9 100755
--- a/t/insthook.sh
+++ b/t/insthook.sh
@@ -59,7 +59,7 @@ test -f ok
./configure "--bindir=`pwd`/bin"
$MAKE install
echo 2 > foo
-$MAKE install VERSION=2.0
+$MAKE install VERSION=2.0
grep 1 bin/foo-1.0
grep 2 bin/foo-2.0
grep 2 bin/foo
diff --git a/t/mmodely.sh b/t/mmodely.sh
index d026900..a628419 100755
--- a/t/mmodely.sh
+++ b/t/mmodely.sh
@@ -88,7 +88,7 @@ PATH="`pwd`$PATH_SEPARATOR$PATH"
$MAKE maintainer-clean
./configure
$MAKE zardoz.c joe.c YACC="myyacc.sh" LEX="mylex.sh" \
- LEX_OUTPUT_ROOT='lex.yy'
+ LEX_OUTPUT_ROOT='lex.yy'
grep zardoz.y zardoz.c
grep joe.l joe.c
diff --git a/t/no-outdir-option.sh b/t/no-outdir-option.sh
deleted file mode 100755
index 6212534..0000000
--- a/t/no-outdir-option.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
-#
-# This program 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.
-#
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the '-o' aka '--output-dir' option is not recognized anymore.
-
-. ./defs || Exit 1
-
-: > Makefile.am
-
-AUTOMAKE_fails -Wno-error --output-dir=foo
-grep 'unrecognized option.*--output-dir' stderr
-
-AUTOMAKE_fails -Wno-error -o foo
-grep 'unrecognized option.*-o' stderr
-
-:
diff --git a/t/objc-flags.sh b/t/objc-flags.sh
index 6c2b1e6..25f805b 100755
--- a/t/objc-flags.sh
+++ b/t/objc-flags.sh
@@ -57,6 +57,6 @@ grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)' Makefile.in &&
Exit 1
grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && Exit 1
./configure OBJCFLAGS=-UERROR
-$MAKE
+$MAKE
:
diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh
index a948891..082f7fb 100755
--- a/t/objcxx-flags.sh
+++ b/t/objcxx-flags.sh
@@ -58,6 +58,6 @@ grep '\$(OBJCXXFLAGS).*\$(foo.*_OBJCXXFLAGS)' Makefile.in
&& Exit 1
grep '\$(foo.*_OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && Exit 1
./configure OBJCXXFLAGS=-UERROR
-$MAKE
+$MAKE
:
diff --git a/t/parallel-tests2.sh b/t/parallel-tests2.sh
index 8dd1a1b..0735185 100755
--- a/t/parallel-tests2.sh
+++ b/t/parallel-tests2.sh
@@ -132,7 +132,7 @@ test ! -f baz.log
test -f mylog.html
$MAKE clean
-$MAKE recheck-html TESTS=foo.test
+$MAKE recheck-html TESTS=foo.test
test -f bla
test ! -f foo.log
test -f mylog.html
diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
new file mode 100755
index 0000000..fa2dda3
--- /dev/null
+++ b/t/per-target-flags.sh
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program 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.
+#
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test executable-specific and library-specific flags, both with
+# and without dependency tracking.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([-Wno-extra-portability])
+AC_CONFIG_FILES([Makefile libMakefile Makefile2 libMakefile2])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_CXX
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+$ACLOCAL
+
+makefiles='Makefile libMakefile Makefile2 libMakefile2'
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+foo_CFLAGS = -DBAR
+END
+
+cat > libMakefile.am << 'END'
+lib_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c bar.cc
+libfoo_a_CFLAGS = -DBAR
+libfoo_a_CXXFLAGS = -DZOT
+END
+
+cat - Makefile.am > Makefile2.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+END
+
+cat - libMakefile.am > libMakefile2.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+END
+
+# Make sure 'compile' is required.
+for m in $makefiles; do
+ AUTOMAKE_fails $m
+ $EGREP " required file.* '(compile|\./compile)'" stderr
+done
+
+: > compile
+$AUTOMAKE
+
+# Regression test for missing space.
+$FGREP ')-c' $makefiles && Exit 1
+
+# Regression test for botchedly transformed object names.
+$FGREP '.o.o' $makefiles && Exit 1
+$FGREP '.obj.obj' $makefiles && Exit 1
+$FGREP '.$(OBJEXT).$(OBJEXT)' $makefiles && Exit 1
+
+# Watch against non-transformed "foo.$(OBJEXT)", "foo.o" and "foo.obj"
+# (and similarly for bar).
+$EGREP '[^-](foo|bar)\.[o$]' $makefiles && Exit 1
+
+# All our programs and libraries have per-target flags, so all
+# the compilers invocations must use an explicit '-c' option.
+grep 'COMPILE. [^-]' $makefiles && Exit 1
+grep 'COMPILE. .[^c]' $makefiles && Exit 1
+
+$FGREP 'foo-foo.$(OBJEXT)' Makefile.in
+$FGREP 'foo-foo.$(OBJEXT)' Makefile2.in
+$FGREP 'libfoo_a-foo.$(OBJEXT)' libMakefile.in
+$FGREP 'libfoo_a-foo.$(OBJEXT)' libMakefile2.in
+$FGREP 'libfoo_a-bar.$(OBJEXT)' libMakefile.in
+$FGREP 'libfoo_a-bar.$(OBJEXT)' libMakefile2.in
+
+$FGREP '$(foo_CFLAGS)' Makefile.in
+$FGREP '$(foo_CFLAGS)' Makefile2.in
+$FGREP '$(libfoo_a_CFLAGS)' libMakefile.in
+$FGREP '$(libfoo_a_CFLAGS)' libMakefile2.in
+
+:
diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh
index a11bb8e..e245b6e 100755
--- a/t/perf/testsuite-summary.sh
+++ b/t/perf/testsuite-summary.sh
@@ -45,7 +45,7 @@ for i in `seq_ 1 $count`; do
echo :test-result: PASS >> $i.trs
echo :copy-in-global-log: yes >> $i.trs
echo TESTS += $i.t
-done >> Makefile.am
+done >> Makefile.am
# Re-enable shell traces.
set -x
diff --git a/t/silent2.sh b/t/silent2.sh
index ee5fc01..a7f0207 100755
--- a/t/silent2.sh
+++ b/t/silent2.sh
@@ -16,7 +16,7 @@
# Check silent-rules mode, without libtool, non-fastdep case
# (so that, with GCC, we also cover the other code paths in depend2).
-
+
# Please keep this file in sync with silent.test.
required=gcc
diff --git a/t/silentcxx.sh b/t/silentcxx.sh
index 5090483..e350726 100755
--- a/t/silentcxx.sh
+++ b/t/silentcxx.sh
@@ -17,7 +17,7 @@
# This test should work with generic C++ compilers; keep it in sync with
# sister test 'silentcxx-gcc.test', which requires the GNU C++ compiler
# and forces the use of gcc depmode.
-
+
required=c++
. ./defs || Exit 1
diff --git a/t/specflg.sh b/t/specflg.sh
deleted file mode 100755
index 6cb6b36..0000000
--- a/t/specflg.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This program 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.
-#
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test of flags specific to executable.
-
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-foo_CFLAGS = -DBAR
-END
-
-# Make sure 'compile' is required.
-$ACLOCAL
-AUTOMAKE_fails
-grep 'required.*compile' stderr
-
-: > compile
-
-$AUTOMAKE
-
-$FGREP 'foo-foo.$(OBJEXT)' Makefile.in
-
-# Watch against "$(COMPILE) -c" in "%.o: %.c" rule.
-grep 'COMPILE. [^-]' Makefile.in && Exit 1
-
-# Watch against "foo.$(OBJEXT)", "foo.o" and "foo.obj".
-grep '[^-]foo\.[o$]' Makefile.in && Exit 1
-
-# Regression test for missing space.
-$FGREP ')-c' Makefile.in && Exit 1
-
-:
diff --git a/t/specflg2.sh b/t/specflg2.sh
deleted file mode 100755
index aff03b8..0000000
--- a/t/specflg2.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This program 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.
-#
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test library-specific flags.
-
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AM_PROG_AR
-AC_PROG_RANLIB
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
-lib_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c bar.cc
-libfoo_a_CFLAGS = -DBAR
-libfoo_a_CXXFLAGS = -DZOT
-END
-
-: > ar-lib
-
-# Make sure 'compile' is required.
-$ACLOCAL
-AUTOMAKE_fails
-grep 'required.*compile' stderr
-
-: > compile
-
-$AUTOMAKE
-
-$FGREP 'libfoo_a-foo.$(OBJEXT)' Makefile.in
-$FGREP 'libfoo_a-bar.$(OBJEXT)' Makefile.in
-
-# Watch against "$(COMPILE) -c" in the "%.o: %c" rule.
-grep 'COMPILE. [^-]' Makefile.in && Exit 1
-
-# Watch against "foo.$(OBJEXT)", "foo.o" and "foo.obj".
-grep foo Makefile.in
-grep '[^-]foo\.[o$]' Makefile.in && Exit 1
-
-# Watch against "bar.$(OBJEXT)", "bar.o" and "bar.obj".
-grep bar Makefile.in
-grep '[^-]bar\.[o$]' Makefile.in && Exit 1
-
-:
diff --git a/t/specflg3.sh b/t/specflg3.sh
deleted file mode 100755
index 78cf237..0000000
--- a/t/specflg3.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This program 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.
-#
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test exe-specific flags with dependency tracking.
-
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-foo_CFLAGS = -DFOO
-END
-
-: > compile
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP 'foo-foo.$(OBJEXT)' Makefile.in
-$FGREP 'foo.o.o' Makefile.in && Exit 1
-$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in && Exit 1
-$FGREP '$(foo_CFLAGS)' Makefile.in
-
-:
diff --git a/t/suffix-custom-subobj.sh b/t/suffix-custom-subobj.sh
index 54b6eff..254ab79 100755
--- a/t/suffix-custom-subobj.sh
+++ b/t/suffix-custom-subobj.sh
@@ -50,7 +50,7 @@ $AUTOMAKE -a
./configure
-$MAKE test-fake OBJEXT=quux
+$MAKE test-fake OBJEXT=quux
$MAKE test-real
:
diff --git a/t/suffix-obj.sh b/t/suffix-obj.sh
index 925b6ac..41d70ee 100755
--- a/t/suffix-obj.sh
+++ b/t/suffix-obj.sh
@@ -77,7 +77,7 @@ cat > foo.exp <<'END'
%THREE%
END
echo %THREE% > foo.zoo
-$MAKE OBJEXT=obj
+$MAKE OBJEXT=obj
cat foo.obj
cat foo.XxX
diff foo.XxX foo.exp
diff --git a/t/txinfo21b.sh b/t/txinfo21b.sh
index 429c2bb..3e053de 100755
--- a/t/txinfo21b.sh
+++ b/t/txinfo21b.sh
@@ -19,7 +19,7 @@
# Keep in sync with sister test 'txinfo21.sh'.
# FIXME: in the long term, the best thing to do is probably to
# FIXME: convert this test and the sister test 'txinfo21b.sh' to
-# FIXME: TAP, and merge them.
+# FIXME: TAP, and merge them.
required='makeinfo-html tex texi2dvi'
. ./defs || Exit 1
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
index 0e8612f..174d704 100755
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
@@ -83,6 +83,6 @@ chmod u+w .
$MAKE all YACC=false
ls -l sub/*.[ch] && Exit 1
-$MAKE distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false'
+$MAKE distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false'
:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1-344-gf6ce19b,
Stefano Lattarini <=