mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Simlify top-level Makefile since admin is always included

Browse Source 
* 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.
This commit is contained in:
Glenn Morris 2021-04-24 10:05:17 -07:00
parent 2c2dfbbbf0
commit 9b8dc629d3
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.in
View File

@ -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}