* tests/suffix11.test: Check for suffixes containing `-'.

* lib/Automake/Rule.pm ($_SUFFIX_RULE_PATTERN): Accept `-' in
suffixes.

diff --git a/ChangeLog b/ChangeLog
index ce9886ba9389d321bda6ba07d328d98c281961fb..c2aa23284bd733e1199df3b69d1e8d591292cc64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-11-17  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * tests/suffix11.test: Check for suffixes containing `-'.
+       * lib/Automake/Rule.pm ($_SUFFIX_RULE_PATTERN): Accept `-' in
+       suffixes.
+
        * lib/Automake/Rule.pm (define): Suggest using target-local instead
        of target-am, not target-am-local.
        * tests/overrid.test: Check the diagnostic for clean-am.

diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 88a12c4db0a289248065891e043d51d0a4ed0a0a..f92c893e9ee9e46d11f65ec30403e29553ecc3c6 100644 (file)
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -95,7 +95,7 @@ non-object).
 =cut
 
 my $_SUFFIX_RULE_PATTERN =
-  '^(\.[a-zA-Z0-9_(){}$+@]+)(\.[a-zA-Z0-9_(){}$+@]+)' . "\$";
+  '^(\.[a-zA-Z0-9_(){}$+@\-]+)(\.[a-zA-Z0-9_(){}$+@\-]+)' . "\$";
 
 # Suffixes found during a run.
 use vars '@_suffixes';

diff --git a/tests/suffix11.test b/tests/suffix11.test
index 03cb3934a0ce7e8b615a5f6cb07c2cf754c38cb0..79618751f100374214c07e5805591eab71f323e7 100755 (executable)
--- a/tests/suffix11.test
+++ b/tests/suffix11.test
@@ -20,6 +20,7 @@
 
 # Tests that Automake understand multiple suffix rules on the same line.
 # PR/371 and PR/372: Reported by Duncan Gibson.
+# We also check for suffixes containing `-'.
 
 . ./defs || exit 1
 
@@ -33,9 +34,9 @@ EOF
 cat >Makefile.am << 'END'
 bin_PROGRAMS = foo bar baz
 foo_SOURCES = foo.x_
-bar_SOURCES = bar.y_
-baz_SOURCES = baz1.x_ baz2.y_
-.y_.c .x_.c:
+bar_SOURCES = bar.y-z
+baz_SOURCES = baz1.x_ baz2.y-z
+.y-z.c .x_.c:
        cp $< $@
   .z_.c   .w_.x_ :
        cp $< $@