[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
51-factored-cleans.patch
From: |
Akim Demaille |
Subject: |
51-factored-cleans.patch |
Date: |
Wed, 21 Feb 2001 21:22:22 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* 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.
Index: automake.in
--- automake.in Wed, 21 Feb 2001 18:57:29 +0100 akim (am/f/39_automake.i 1.59
755)
+++ automake.in Wed, 21 Feb 2001 19:34:48 +0100 akim (am/f/39_automake.i 1.59
755)
@@ -7165,15 +7165,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')
Index: data-clean.am
--- data-clean.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/47_data-clean 1.1
644)
+++ data-clean.am Wed, 21 Feb 2001 19:23:11 +0100 akim (am/g/47_data-clean 1.1
644)
@@ -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.
Index: java-clean.am
--- java-clean.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/37_java-clean 1.1
644)
+++ java-clean.am Wed, 21 Feb 2001 19:30:18 +0100 akim (am/g/37_java-clean 1.1
644)
@@ -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.
address@hidden@JAVA:
+.PHONY clean-am: address@hidden@JAVA:
address@hidden@JAVA:
-rm *.class address@hidden@.stamp
-
address@hidden@JAVA:
-
address@hidden@JAVA:
Index: libs-clean.am
--- libs-clean.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/33_libs-clean 1.1
644)
+++ libs-clean.am Wed, 21 Feb 2001 19:24:40 +0100 akim (am/g/33_libs-clean 1.1
644)
@@ -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.
address@hidden@LIBRARIES:
+.PHONY clean-am: address@hidden@LIBRARIES
address@hidden@LIBRARIES:
-test -z "$(@address@hidden)" || rm -f $(@address@hidden)
-
address@hidden@LIBRARIES:
-
address@hidden@LIBRARIES:
Index: lisp-clean.am
--- lisp-clean.am Sun, 04 Feb 2001 14:35:53 +0100 akim (am/g/30_lisp-clean 1.2
644)
+++ lisp-clean.am Wed, 21 Feb 2001 19:25:38 +0100 akim (am/g/30_lisp-clean 1.2
644)
@@ -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)
Index: ltlib-clean.am
--- ltlib-clean.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/28_ltlib-clea 1.1
644)
+++ ltlib-clean.am Wed, 21 Feb 2001 19:24:35 +0100 akim (am/g/28_ltlib-clea 1.1
644)
@@ -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.
address@hidden@LTLIBRARIES:
+.PHONY clean-am: address@hidden@LTLIBRARIES
address@hidden@LTLIBRARIES:
-test -z "$(@address@hidden)" || rm -f $(@address@hidden)
-
address@hidden@LTLIBRARIES:
-
address@hidden@LTLIBRARIES:
Index: progs-clean.am
--- progs-clean.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/21_progs-clea 1.1
644)
+++ progs-clean.am Wed, 21 Feb 2001 19:26:06 +0100 akim (am/g/21_progs-clea 1.1
644)
@@ -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.
address@hidden@PROGRAMS:
+.PHONY clean-am: address@hidden@PROGRAMS
address@hidden@PROGRAMS:
-test -z "$(@address@hidden)" || rm -f $(@address@hidden)
-
address@hidden@PROGRAMS:
-
address@hidden@PROGRAMS:
Index: python-clean.am
--- python-clean.am Sun, 04 Feb 2001 14:35:53 +0100 akim (am/g/18_python-cle
1.2 644)
+++ python-clean.am Wed, 21 Feb 2001 19:24:28 +0100 akim (am/g/18_python-cle
1.2 644)
@@ -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)
Index: tags-clean.am
--- tags-clean.am Sun, 04 Feb 2001 14:35:53 +0100 akim (am/g/13_tags-clean 1.2
644)
+++ tags-clean.am Wed, 21 Feb 2001 19:26:24 +0100 akim (am/g/13_tags-clean 1.2
644)
@@ -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
- 51-factored-cleans.patch,
Akim Demaille <=