From 9b8dc629d37de32abba76ac9b4b6106491cd21a4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 24 Apr 2021 10:05:17 -0700 Subject: [PATCH] Simlify top-level Makefile since admin is always included * Makefile.in (clean_dirs, distclean_dirs, maintainer_clean_dirs): Add admin directories. (clean, distclean, bootstrap-clean, maintainer-clean): Simplify. (maybeclean_dirs): Remove - this dates to when admin/ was not included in tar files. --- Makefile.in | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/Makefile.in b/Makefile.in index 638548370c3..f04ba0c5c9d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -834,12 +834,11 @@ mostlyclean: $(mostlyclean_dirs:=_mostlyclean) ### with them. ### ### Delete '.dvi' files here if they are not part of the distribution. -clean_dirs = $(mostlyclean_dirs) nextstep +clean_dirs = $(mostlyclean_dirs) nextstep admin/charsets admin/unidata $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean))) clean: $(clean_dirs:=_clean) - $(MAKE) -C admin/charsets $@ [ ! -d test ] || $(MAKE) -C test $@ -rm -f ./*.tmp etc/*.tmp* -rm -rf info-dir.* @@ -860,16 +859,11 @@ top_distclean=\ rm -f config.status config.log~ \ Makefile makefile lib/gnulib.mk ${SUBDIR_MAKEFILES} -distclean_dirs = $(clean_dirs) leim lisp +distclean_dirs = $(clean_dirs) leim lisp admin/grammars $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),distclean))) -maybeclean_dirs = test admin/grammars admin/unidata admin/charsets - distclean: $(distclean_dirs:=_distclean) - for dir in $(filter-out test,$(maybeclean_dirs)); do \ - $(MAKE) -C $$dir $@ || exit; \ - done [ ! -d test ] || $(MAKE) -C test $@ ${top_distclean} @@ -879,9 +873,6 @@ distclean: $(distclean_dirs:=_distclean) $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),bootstrap-clean))) bootstrap-clean: $(distclean_dirs:=_bootstrap-clean) - for dir in $(filter-out test,$(maybeclean_dirs)); do \ - $(MAKE) -C $$dir $@ || exit; \ - done [ ! -d test ] || $(MAKE) -C test $@ [ ! -f config.log ] || mv -f config.log config.log~ rm -rf ${srcdir}/info @@ -903,14 +894,12 @@ top_maintainer_clean=\ ${top_distclean}; \ rm -fr autom4te.cache -maintainer_clean_dirs = src leim lisp +maintainer_clean_dirs = src leim lisp admin/charsets admin/grammars \ + admin/unidata $(foreach dir,$(maintainer_clean_dirs),$(eval $(call submake_template,$(dir),maintainer-clean))) maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean) - for dir in $(filter-out test,$(maybeclean_dirs)); do \ - $(MAKE) -C $$dir $@ || exit; \ - done [ ! -d test ] || $(MAKE) -C test $@ ${top_maintainer_clean} -- 2.39.5