diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-05-10 10:42:53 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-05-10 10:42:53 -0700 |
| commit | dc151c000128cef231dfd88c6da43ad76cc08aeb (patch) | |
| tree | 9b779c3ea38ea0f9e2584f8c8e397fe55528bc82 /Makefile.in | |
| parent | 02c80307f13f7ffe3dc024aee72e47060b4a1996 (diff) | |
| download | emacs-dc151c000128cef231dfd88c6da43ad76cc08aeb.tar.gz | |
Always include the test/ directory in tarfiles
In hindsight, it's hard to see why not including it was ever an option.
* make-dist: Always include the test/ directory.
(with_tests): Remove.
(--tests, --no-tests): Make these options no-ops.
* Makefile.in (mostlyclean_dirs, maintainer_clean_dirs): Add "test".
(mostlyclean, clean, distclean, maintainer-clean):
Remove special-casing for "test".
($(CHECK_TARGETS)): Simplify.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index 6bde5e5f059..21e6336a7d5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -845,12 +845,11 @@ endef ### target for GCC does not delete 'libgcc.a', because recompiling it ### is rarely necessary and takes a lot of time. mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/emacs doc/misc \ - doc/lispref doc/lispintro + doc/lispref doc/lispintro test $(foreach dir,$(mostlyclean_dirs),$(eval $(call submake_template,$(dir),mostlyclean))) mostlyclean: $(mostlyclean_dirs:=_mostlyclean) - [ ! -d test ] || $(MAKE) -C test $@ ### 'clean' ### Delete all files from the current directory that are normally @@ -865,7 +864,6 @@ clean_dirs = $(mostlyclean_dirs) nextstep admin/charsets admin/unidata $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean))) clean: $(clean_dirs:=_clean) - [ ! -d test ] || $(MAKE) -C test $@ -rm -f ./*.tmp etc/*.tmp* -rm -rf info-dir.* -rm -rf native-lisp @@ -891,7 +889,6 @@ distclean_dirs = $(clean_dirs) leim lisp admin/grammars $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),distclean))) distclean: $(distclean_dirs:=_distclean) - [ ! -d test ] || $(MAKE) -C test $@ ${top_distclean} ### 'bootstrap-clean' @@ -900,7 +897,6 @@ distclean: $(distclean_dirs:=_distclean) $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),bootstrap-clean))) bootstrap-clean: $(distclean_dirs:=_bootstrap-clean) - [ ! -d test ] || $(MAKE) -C test $@ [ ! -f config.log ] || mv -f config.log config.log~ rm -rf ${srcdir}/info rm -f ${srcdir}/etc/refcards/emacsver.tex @@ -922,12 +918,11 @@ top_maintainer_clean=\ rm -fr ${srcdir}/autom4te.cache maintainer_clean_dirs = src leim lisp admin/charsets admin/grammars \ - admin/unidata + admin/unidata test $(foreach dir,$(maintainer_clean_dirs),$(eval $(call submake_template,$(dir),maintainer-clean))) maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean) - [ ! -d test ] || $(MAKE) -C test $@ rm -rf ${srcdir}/info rm -f ${srcdir}/etc/refcards/emacsver.tex ${top_maintainer_clean} @@ -958,12 +953,7 @@ TAGS tags: lib lib-src # src CHECK_TARGETS = check check-maybe check-expensive check-all .PHONY: $(CHECK_TARGETS) $(CHECK_TARGETS): all -ifeq ($(wildcard test),test) $(MAKE) -C test $@ -else - @echo "You do not seem to have the test/ directory." - @echo "Maybe you used a release tarfile that lacks tests." -endif test/%: $(MAKE) -C test $* |