diff options
| -rw-r--r-- | lisp/Makefile.in | 17 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index fdd39d5fd54..8ba619656d8 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -356,6 +356,13 @@ compile-main: gen-lisp compile-clean $(MAKE) compile-targets TARGETS="$$chunk"; \ done +.PHONY: native-compile-clean +native-compile-clean: +# Erase all eln output compilation folders. +ifeq ($(HAVE_NATIVE_COMP),yes) + find $(lisp) -regex ".*/eln-.*-[0-9a-z]+\\'" -type d | xargs rm -rf +endif + .PHONY: compile-clean # Erase left-over .elc files that do not have a corresponding .el file. compile-clean: @@ -366,10 +373,6 @@ compile-clean: echo rm "$${el}c"; \ rm "$${el}c"; \ fi; \ - if test -f "$$el" || test ! -f "$${el}n"; then :; else \ - echo rm "$${el}n"; \ - rm "$${el}n"; \ - fi; \ done .PHONY: gen-lisp leim semantic @@ -396,7 +399,7 @@ compile: $(LOADDEFS) autoloads compile-first # Compile all Lisp files. This is like 'compile' but compiles files # unconditionally. Some files don't actually get compiled because they # set the local variable no-byte-compile. -compile-always: +compile-always: native-compile-clean find $(lisp) -name '*.elc' $(FIND_DELETE) $(MAKE) compile @@ -486,8 +489,8 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el .PHONY: bootstrap-clean distclean maintainer-clean extraclean -bootstrap-clean: - find $(lisp) -regex '.*\.elc\|.*\.eln' $(FIND_DELETE) +bootstrap-clean: native-compile-clean + find $(lisp) -name '*.elc' $(FIND_DELETE) rm -f $(AUTOGENEL) distclean: diff --git a/src/Makefile.in b/src/Makefile.in index 52d8ddd4e5d..8d7fdb8a607 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -327,7 +327,7 @@ GMP_LIB = @GMP_LIB@ GMP_OBJ = @GMP_OBJ@ LIBGCCJIT = @LIBGCCJIT_LIB@ -## dynlib.o comp.o if native compiler is enabled, else empty +## dynlib.o comp.o if native compiler is enabled, otherwise empty. COMP_OBJ = @COMP_OBJ@ RUN_TEMACS = ./temacs |