From: Tom Tromey <tromey@redhat.com>
Date: Sun, 15 Jul 2001 21:55:07 +0000 (+0000)
Subject: 	Report from Ralf Corsepius:
X-Git-Tag: Release-1-4j~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5ea1a6d689622da6d1f5ab274e06c93bdacadea;p=thirdparty%2Fautomake.git

	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 6abb96a05..e39f0a28b 100644
--- 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 c0173ceaa..63f33920c 100755
--- 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 4037c87e3..7e6e7b678 100644
--- 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 d9a2f22d4..003be1260 100644
--- 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
index 000000000..7e547202d
--- /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