From: Glenn Morris <rgm@gnu.org>
Date: Fri, 22 May 2015 23:05:59 +0000 (-0400)
Subject: * Makefile.in: Add admin/charsets into top-level clean rules.
X-Git-Tag: emacs-25.0.90~2015
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/50ecfcd6488f596035e8dc8203cfec3e40508c89

* Makefile.in: Add admin/charsets into top-level clean rules.

(clean): Add admin/charsets.
(maybeclean_dirs): New variable.
(distclean, bootstrap-clean, maintainer-clean): Use $maybeclean_dirs.
---

diff --git a/Makefile.in b/Makefile.in
index eec6d31352..9790dbd7b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -831,7 +831,7 @@ clean_dirs = $(mostlyclean_dirs) nextstep
 $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean)))
 
 clean: $(clean_dirs:=_clean)
-	for dir in test/automated; do \
+	for dir in test/automated admin/charsets; do \
 	  [ ! -d $$dir ] || $(MAKE) -C $$dir clean; \
 	done
 	-rm -f *.tmp etc/*.tmp*
@@ -856,8 +856,10 @@ distclean_dirs = $(clean_dirs) leim lisp
 
 $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),distclean)))
 
+maybeclean_dirs = test/automated admin/grammars admin/unidata admin/charsets
+
 distclean: $(distclean_dirs:=_distclean)
-	for dir in test/automated admin/grammars admin/unidata; do \
+	for dir in ${maybeclean_dirs}; do \
 	  [ ! -d $$dir ] || $(MAKE) -C $$dir distclean; \
 	done
 	${top_distclean}
@@ -868,7 +870,7 @@ distclean: $(distclean_dirs:=_distclean)
 $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),bootstrap-clean)))
 
 bootstrap-clean: $(distclean_dirs:=_bootstrap-clean)
-	for dir in test/automated admin/grammars admin/unidata; do \
+	for dir in ${maybeclean_dirs}; do \
 	  [ ! -d $$dir ] || $(MAKE) -C $$dir bootstrap-clean; \
 	done
 	[ ! -f config.log ] || mv -f config.log config.log~
@@ -896,7 +898,7 @@ maintainer_clean_dirs = src leim lisp
 $(foreach dir,$(maintainer_clean_dirs),$(eval $(call submake_template,$(dir),maintainer-clean)))
 
 maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean)
-	for dir in test/automated admin/grammars admin/unidata; do \
+	for dir in ${maybeclean_dirs}; do \
 	  [ ! -d $$dir ] || $(MAKE) -C $$dir maintainer-clean; \
 	done
 	${top_maintainer_clean}
@@ -910,6 +912,7 @@ maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean)
 $(foreach dir,$(SUBDIR),$(eval $(call submake_template,$(dir),extraclean)))
 
 ## FIXME this is busted because most of these do not have extraclean rules.
+## Also it is missing things that do have such rules.
 extraclean: $(SUBDIR:=_extraclean)
 	${top_maintainer_clean}
 	-rm -f config-tmp-*