aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-05-22 19:05:59 -0400
committerGlenn Morris2015-05-22 19:05:59 -0400
commit50ecfcd6488f596035e8dc8203cfec3e40508c89 (patch)
tree623cb78ae7d5c2e0c6938ef3c88bcb8327f2a1f8
parent2bf7996ad86dfb646f299e2270bb826c500d4dfe (diff)
downloademacs-50ecfcd6488f596035e8dc8203cfec3e40508c89.tar.gz
emacs-50ecfcd6488f596035e8dc8203cfec3e40508c89.zip
* 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.
-rw-r--r--Makefile.in11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index eec6d313524..9790dbd7b10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -831,7 +831,7 @@ clean_dirs = $(mostlyclean_dirs) nextstep
831$(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean))) 831$(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean)))
832 832
833clean: $(clean_dirs:=_clean) 833clean: $(clean_dirs:=_clean)
834 for dir in test/automated; do \ 834 for dir in test/automated admin/charsets; do \
835 [ ! -d $$dir ] || $(MAKE) -C $$dir clean; \ 835 [ ! -d $$dir ] || $(MAKE) -C $$dir clean; \
836 done 836 done
837 -rm -f *.tmp etc/*.tmp* 837 -rm -f *.tmp etc/*.tmp*
@@ -856,8 +856,10 @@ distclean_dirs = $(clean_dirs) leim lisp
856 856
857$(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),distclean))) 857$(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),distclean)))
858 858
859maybeclean_dirs = test/automated admin/grammars admin/unidata admin/charsets
860
859distclean: $(distclean_dirs:=_distclean) 861distclean: $(distclean_dirs:=_distclean)
860 for dir in test/automated admin/grammars admin/unidata; do \ 862 for dir in ${maybeclean_dirs}; do \
861 [ ! -d $$dir ] || $(MAKE) -C $$dir distclean; \ 863 [ ! -d $$dir ] || $(MAKE) -C $$dir distclean; \
862 done 864 done
863 ${top_distclean} 865 ${top_distclean}
@@ -868,7 +870,7 @@ distclean: $(distclean_dirs:=_distclean)
868$(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),bootstrap-clean))) 870$(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),bootstrap-clean)))
869 871
870bootstrap-clean: $(distclean_dirs:=_bootstrap-clean) 872bootstrap-clean: $(distclean_dirs:=_bootstrap-clean)
871 for dir in test/automated admin/grammars admin/unidata; do \ 873 for dir in ${maybeclean_dirs}; do \
872 [ ! -d $$dir ] || $(MAKE) -C $$dir bootstrap-clean; \ 874 [ ! -d $$dir ] || $(MAKE) -C $$dir bootstrap-clean; \
873 done 875 done
874 [ ! -f config.log ] || mv -f config.log config.log~ 876 [ ! -f config.log ] || mv -f config.log config.log~
@@ -896,7 +898,7 @@ maintainer_clean_dirs = src leim lisp
896$(foreach dir,$(maintainer_clean_dirs),$(eval $(call submake_template,$(dir),maintainer-clean))) 898$(foreach dir,$(maintainer_clean_dirs),$(eval $(call submake_template,$(dir),maintainer-clean)))
897 899
898maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean) 900maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean)
899 for dir in test/automated admin/grammars admin/unidata; do \ 901 for dir in ${maybeclean_dirs}; do \
900 [ ! -d $$dir ] || $(MAKE) -C $$dir maintainer-clean; \ 902 [ ! -d $$dir ] || $(MAKE) -C $$dir maintainer-clean; \
901 done 903 done
902 ${top_maintainer_clean} 904 ${top_maintainer_clean}
@@ -910,6 +912,7 @@ maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean)
910$(foreach dir,$(SUBDIR),$(eval $(call submake_template,$(dir),extraclean))) 912$(foreach dir,$(SUBDIR),$(eval $(call submake_template,$(dir),extraclean)))
911 913
912## FIXME this is busted because most of these do not have extraclean rules. 914## FIXME this is busted because most of these do not have extraclean rules.
915## Also it is missing things that do have such rules.
913extraclean: $(SUBDIR:=_extraclean) 916extraclean: $(SUBDIR:=_extraclean)
914 ${top_maintainer_clean} 917 ${top_maintainer_clean}
915 -rm -f config-tmp-* 918 -rm -f config-tmp-*