From b77e84ef89fe44fda5988a66dfe28feb9f982025 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 23 Feb 2001 15:11:19 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ automake.in | 9 --------- data-clean.am | 1 + java-clean.am | 8 ++------ libs-clean.am | 8 ++------ lisp-clean.am | 3 +-- ltlib-clean.am | 8 ++------ progs-clean.am | 8 ++------ python-clean.am | 4 ++-- tags-clean.am | 6 +++--- 10 files changed, 23 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6e810b06..0ce8de177 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-02-23 Akim Demaille + + * 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 * automake.in: Promote local `my' over `local'. diff --git a/automake.in b/automake.in index ca630678f..d172437e4 100755 --- 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 e61b9faa1..9e2a13d7a 100644 --- 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 900b732f5..6378895e9 100644 --- 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 902fc5442..5d489fc08 100644 --- 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 3ac28e334..0affb7932 100644 --- 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 10b58cd3c..86b873666 100644 --- 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 c5365508f..95a099a76 100644 --- 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 cc37b0d82..34879f0db 100644 --- 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 cdac6a62b..e17b85ada 100644 --- 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 -- 2.47.2