From 21e87c9367163ab47db8191bd1771350c7e7b43f Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 3 Jun 2004 20:19:27 +0000 Subject: [PATCH] * lib/am/clean.am (distclean-generic): Do no `rm -f $(CONFIG_CLEAN_FILES)' if `$(CONFIG_CLEAN_FILES)' is empty. Report from Nicolas Joly. --- ChangeLog | 6 ++++++ Makefile.in | 2 +- doc/Makefile.in | 2 +- lib/Automake/Makefile.in | 2 +- lib/Automake/tests/Makefile.in | 2 +- lib/Makefile.in | 2 +- lib/am/Makefile.in | 2 +- lib/am/clean.am | 4 ++-- m4/Makefile.in | 2 +- tests/Makefile.in | 2 +- 10 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index d28de58a1..8759f2b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-06-03 Alexandre Duret-Lutz + + * lib/am/clean.am (distclean-generic): Do no + `rm -f $(CONFIG_CLEAN_FILES)' if `$(CONFIG_CLEAN_FILES)' is empty. + Report from Nicolas Joly. + 2004-05-31 Alexandre Duret-Lutz * NEWS: Make clearer that we do not output partial Makefile.ins on diff --git a/Makefile.in b/Makefile.in index 648ec075f..496a06095 100644 --- a/Makefile.in +++ b/Makefile.in @@ -524,7 +524,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/doc/Makefile.in b/doc/Makefile.in index 7f906cf35..b736bd871 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -394,7 +394,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 0235897a0..68e91e263 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -433,7 +433,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 6b96a87f4..b37898631 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -289,7 +289,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/lib/Makefile.in b/lib/Makefile.in index 82c25fb9c..e52e846f7 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -408,7 +408,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 39e20c6c4..931b3d402 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -280,7 +280,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/lib/am/clean.am b/lib/am/clean.am index 04f90c9b5..6d650d962 100644 --- a/lib/am/clean.am +++ b/lib/am/clean.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003 +## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -30,7 +30,7 @@ clean-generic: distclean-am: distclean-generic clean-am distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) %DISTCLEAN_RMS% ## Makefiles and their dependencies cannot be cleaned by diff --git a/m4/Makefile.in b/m4/Makefile.in index 517c6ca76..864279215 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -275,7 +275,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/tests/Makefile.in b/tests/Makefile.in index e4362099a..7e6931c98 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -842,7 +842,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" -- 2.47.2