Re: automake-1.7b feedback (2)

[Alexandre Duret-Lutz]

>>> "Bruno" == Bruno Haible <address@hidden> writes:

 Bruno> When I override the clean-am target, I get a warning
 Bruno> tests/Makefile.am:165: user target `clean-am' defined here...
 Bruno> automake-1.7b: ... overrides Automake target `clean-am' defined here
 Bruno> tests/Makefile.am:165: consider using clean-am-local instead of clean-am

 Bruno> However, when I follow this advice and use
 Bruno> 'clean-am-local', the generated Makefile rule for
 Bruno> 'clean-am' doesn't depend on 'clean-am-local'.  In fact,
 Bruno> nothing depends on 'clean-am-local', and so the
 Bruno> 'clean-am-local' rule is not executed when I do "make
 Bruno> clean".

Oops, thanks for catching this.  It should of course suggest you
to define clean-local, not clean-am-local.

I'm checking this in.

2003-11-17  Alexandre Duret-Lutz  <address@hidden>

        * 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.
        Report from Bruno Haible.

Index: lib/Automake/Rule.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Rule.pm,v
retrieving revision 1.4
diff -u -r1.4 Rule.pm
--- lib/Automake/Rule.pm        6 Sep 2003 05:36:56 -0000       1.4
+++ lib/Automake/Rule.pm        17 Nov 2003 19:03:40 -0000
@@ -663,7 +663,7 @@
              $noam =~ s/-am$//;
              if (exists $dependencies{"$noam-am"})
                {
-                 $hint = "consider using $target-local instead of $target";
+                 $hint = "consider using $noam-local instead of $target";
                }
 
              msg_cond_rule ('override', $cond, $target,
Index: tests/overrid.test
===================================================================
RCS file: /cvs/automake/automake/tests/overrid.test,v
retrieving revision 1.3
diff -u -r1.3 overrid.test
--- tests/overrid.test  3 Jul 2003 18:58:50 -0000       1.3
+++ tests/overrid.test  17 Nov 2003 19:03:40 -0000
@@ -36,6 +36,8 @@
        :
 html:
        :
+clean-am:
+       :
 
 if COND
 ps: mine
@@ -49,6 +51,9 @@
 grep install-local stderr && exit 1 # There is no such thing as install-local
 grep installcheck-local stderr
 grep html-local stderr
+# Make sure overriding *-am targets suggest using *-local, not *-am.
+grep cleam-am-local stderr && exit 1
+grep clean-local stderr
 
 # Conditional overrides ought to be diagnosed, but it can't be done yet.
 # See the FIXME in rule_define.   Once this is fixed, the grep below
-- 
Alexandre Duret-Lutz