* automake.in (&am_install_var): Don't hook on the clean targets

and .PHONY.
* data-clean.am, java-clean.am, libs-clean.am, lisp-clean.am,
* ltlib-clean.am, progs-clean.am, python-clean.am,  tags-clean.am:
Do it.

diff --git a/ChangeLog b/ChangeLog
index c6e810b068382f94f77d30709d709a3131dc5559..0ce8de17780c2c271dc75b0339cdb86fa3020fb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-23  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&am_install_var): Don't hook on the clean targets
+       and .PHONY.
+       * data-clean.am, java-clean.am, libs-clean.am, lisp-clean.am,
+       * ltlib-clean.am, progs-clean.am, python-clean.am,  tags-clean.am:
+       Do it.
+
 2001-02-23  Akim Demaille  <akim@epita.fr>
 
        * automake.in: Promote local `my' over `local'.

diff --git a/automake.in b/automake.in
index ca630678f4832d3ee2202b62ac2e325b62767328..d172437e49828252133a68825d67658c1c21dd01 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7176,15 +7176,6 @@ sub am_install_var
                  &file_contents ($file . '-clean',
                                  &transform ('DIR' => $X)
                                  . $cygxform);
-
-               &depend ('mostlyclean-am', 'mostlyclean-' . $X . $primary);
-               &depend ('.PHONY', 'mostlyclean-' . $X . $primary);
-               &depend ('clean-am', 'clean-' . $X . $primary);
-               &depend ('.PHONY', 'clean-' . $X . $primary);
-               &depend ('distclean-am', 'distclean-' . $X . $primary);
-               &depend ('.PHONY', 'distclean-' . $X . $primary);
-               &depend ('maintainer-clean-am', 'maintainer-clean-' . $X . $primary);
-               &depend ('.PHONY', 'maintainer-clean-' . $X . $primary);
            }
 
            if ($X eq 'check')

diff --git a/data-clean.am b/data-clean.am
index e61b9faa1a3370450585a4adb15cb2a303e5f20b..9e2a13d7a0b6845264edb40e72946bbf263943cb 100644 (file)
--- a/data-clean.am
+++ b/data-clean.am
@@ -15,4 +15,5 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
+
 ## FIXME: This file must exist, even though it is empty.

diff --git a/java-clean.am b/java-clean.am
index 900b732f5e85c8af195adc89f094b81d6126c303..6378895e938606bcbc3ef156ab53e8567244897e 100644 (file)
--- a/java-clean.am
+++ b/java-clean.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1998 Free Software Foundation, Inc.
+## Copyright 1998, 2001 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
@@ -15,11 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-mostlyclean-@DIR@JAVA:
 
+.PHONY clean-am: clean-@DIR@JAVA:
 clean-@DIR@JAVA:
        -rm *.class class@DIR@.stamp
-
-distclean-@DIR@JAVA:
-
-maintainer-clean-@DIR@JAVA:

diff --git a/libs-clean.am b/libs-clean.am
index 902fc5442dc7c31b5b18a4c2be5569a554e95a67..5d489fc08470ae5064ac9b131c0fd9c1cbe73c46 100644 (file)
--- a/libs-clean.am
+++ b/libs-clean.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 2001 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
@@ -15,11 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-mostlyclean-@DIR@LIBRARIES:
 
+.PHONY clean-am: clean-@DIR@LIBRARIES
 clean-@DIR@LIBRARIES:
        -test -z "$(@DIR@_LIBRARIES)" || rm -f $(@DIR@_LIBRARIES)
-
-distclean-@DIR@LIBRARIES:
-
-maintainer-clean-@DIR@LIBRARIES:

diff --git a/lisp-clean.am b/lisp-clean.am
index 3ac28e334bc24dd1de8280016ac2be515b3e3aa7..0affb7932e1f0a95d52ba2f7b6dbee7e7d856d06 100644 (file)
--- a/lisp-clean.am
+++ b/lisp-clean.am
@@ -16,7 +16,6 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-.PHONY: clean-lisp
-clean-am: clean-lisp
+.PHONY clean-am: clean-lisp
 clean-lisp:
        -test -z "$(ELCFILES)" || rm -f $(ELCFILES)

diff --git a/ltlib-clean.am b/ltlib-clean.am
index 10b58cd3ccb4a0ded9ceded29e695a3b1fc9a373..86b873666f20c368d4795e5d3ea539f4eda0cee2 100644 (file)
--- a/ltlib-clean.am
+++ b/ltlib-clean.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1997 Free Software Foundation, Inc.
+## Copyright 1997, 2001 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
@@ -15,11 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-mostlyclean-@DIR@LTLIBRARIES:
 
+.PHONY clean-am: clean-@DIR@LTLIBRARIES
 clean-@DIR@LTLIBRARIES:
        -test -z "$(@DIR@_LTLIBRARIES)" || rm -f $(@DIR@_LTLIBRARIES)
-
-distclean-@DIR@LTLIBRARIES:
-
-maintainer-clean-@DIR@LTLIBRARIES:

diff --git a/progs-clean.am b/progs-clean.am
index c5365508fec4bc921286395003ac86d1ae3f71bd..95a099a76b402375d096c3e307ee4f0ca8556464 100644 (file)
--- a/progs-clean.am
+++ b/progs-clean.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1997, 2001 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
@@ -15,11 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-mostlyclean-@DIR@PROGRAMS:
 
+.PHONY clean-am: clean-@DIR@PROGRAMS
 clean-@DIR@PROGRAMS:
        -test -z "$(@DIR@_PROGRAMS)" || rm -f $(@DIR@_PROGRAMS)
-
-distclean-@DIR@PROGRAMS:
-
-maintainer-clean-@DIR@PROGRAMS:

diff --git a/python-clean.am b/python-clean.am
index cc37b0d82bc8e1c481daa0939f73cd8195d1bf7b..34879f0db15bfdeb66101b29ad65860fe3c56d9f 100644 (file)
--- a/python-clean.am
+++ b/python-clean.am
@@ -15,8 +15,8 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-.PHONY: clean-python
-clean-am: clean-python
+
+.PHONY clean-am: clean-python
 clean-python:
        -test -z "$(PYCFILES)" || rm -f $(PYCFILES)
        -test -z "$(PYOFILES)" || rm -f $(PYOFILES)

diff --git a/tags-clean.am b/tags-clean.am
index cdac6a62b953b2399973e8e4438c730b0c311091..e17b85adaac6c6ada7405da2b72c8a000f461645 100644 (file)
--- a/tags-clean.am
+++ b/tags-clean.am
@@ -22,8 +22,8 @@
 ## distributions.  Since we do not, we instead have "distclean" remove
 ## them.  The rule is: if the user built it, "distclean" removes it.
 ## If it is shipped, "maintainer-clean" removes it.
-distclean-am: distclean-tags
+
+.PHONY distclean-am: distclean-tags
+
 distclean-tags:
        -rm -f TAGS ID
-
-.PHONY: distclean-tags