Report from Ralf Corsepius:

	* automake.in (TARGET_PATTERN): Add `+' as valid character.
	(SUFFIX_RULE_PATTERN): Likewise.
	* tests/Makefile.am (TESTS): Added cxx.test.
	* tests/cxx.test: New file.

diff --git a/ChangeLog b/ChangeLog
index 6abb96a05d4782ca25eebc03c2c091707ab315c5..e39f0a28b61f53e2817382bc8a03a987d2c9512b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-07-15  Tom Tromey  <tromey@redhat.com>
 
+       Report from Ralf Corsepius:
+       * automake.in (TARGET_PATTERN): Add `+' as valid character.
+       (SUFFIX_RULE_PATTERN): Likewise.
+       * tests/Makefile.am (TESTS): Added cxx.test.
+       * tests/cxx.test: New file.
+
        * lib/am/tags.am (distclean-tags): Remove files for gtags.
        From Shigio Yamaguchi.
 

diff --git a/automake.in b/automake.in
index c0173ceaa46e00ea619897c3ee3ada1bfae9f906..63f33920cec86d37df2a46e0f99d30841add1356 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -133,13 +133,13 @@ my $libdir = "@datadir@/@PACKAGE@";
 my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';
 my $WHITE_PATTERN = '^\s*$';
 my $COMMENT_PATTERN = '^#';
-my $TARGET_PATTERN='[$a-zA-Z_.][-.a-zA-Z0-9_(){}/$]*';
+my $TARGET_PATTERN='[$a-zA-Z_.][-.a-zA-Z0-9_(){}/$+]*';
 # A rule has three parts: a list of targets, a list of dependencies,
 # and optionally actions.
 my $RULE_PATTERN =
   "^($TARGET_PATTERN(?:(?:\\\\\n|\\s)+$TARGET_PATTERN)*) *:([^=].*|)\$";
 
-my $SUFFIX_RULE_PATTERN = '^\.([a-zA-Z0-9]+)\.([a-zA-Z0-9]+)$';
+my $SUFFIX_RULE_PATTERN = '^\.([a-zA-Z0-9+]+)\.([a-zA-Z0-9+]+)$';
 # Only recognize leading spaces, not leading tabs.  If we recognize
 # leading tabs here then we need to make the reader smarter, because
 # otherwise it will think rules like `foo=bar; \' are errors.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4037c87e3061f5b43efd63c3cbc73cc307904c2c..7e6e7b678341ccada14139a36a497185c54e2997 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -82,6 +82,7 @@ confvar.test \
 confvar2.test \
 copy.test \
 ctarget1.test \
+cxx.test \
 cxxansi.test \
 cxxcpp.test \
 cxxlibobj.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d9a2f22d4c039c51e154fabbe7ae7e3550ff0e0c..003be12602c5282d3fe5d630460abf6d089413cb 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -148,6 +148,7 @@ confvar.test \
 confvar2.test \
 copy.test \
 ctarget1.test \
+cxx.test \
 cxxansi.test \
 cxxcpp.test \
 cxxlibobj.test \

diff --git a/tests/cxx.test b/tests/cxx.test
new file mode 100755 (executable)
index 0000000..7e54720
--- /dev/null
+++ b/tests/cxx.test
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# Test that `.c++' extension works.
+# From Ralf Corsepius.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AC_PROG_CXX
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = hello
+hello_SOURCES = hello.c++
+END
+
+$ACLOCAL || exit 1
+$AUTOMAKE || exit 1
+
+grep '^\.SUFFIXES:.*c[+][+]' Makefile.in