[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp dbeafd3 03/12: Some Makefile updates and clean-up
From: |
Andrea Corallo |
Subject: |
feature/native-comp dbeafd3 03/12: Some Makefile updates and clean-up |
Date: |
Mon, 17 Aug 2020 13:12:10 -0400 (EDT) |
branch: feature/native-comp
commit dbeafd34032797c5d743a741492a5d9b35dd8c7b
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
Some Makefile updates and clean-up
* Makefile.in (clean): Remove 'eln-cache' folder.
* lisp/Makefile.in (.SUFFIXES): Remove .eln.
(native-compile-clean): Target remove.
(compile-always, bootstrap-clean): Remove 'native-compile-clean'
prerequisite.
* src/Makefile.in (%.eln): Remove rule.
---
Makefile.in | 1 +
lisp/Makefile.in | 13 +++----------
src/Makefile.in | 4 ----
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index f28623e..253f7f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -863,6 +863,7 @@ clean: $(clean_dirs:=_clean)
[ ! -d test ] || $(MAKE) -C test $@
-rm -f ./*.tmp etc/*.tmp*
-rm -rf info-dir.*
+ -rm -rf eln-cache
### 'bootclean'
### Delete all files that need to be remade for a clean bootstrap.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 9bccece..164e4a0 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -302,7 +302,7 @@ endif
# subdirectories, to make sure require's and load's in the files being
# compiled find the right files.
-.SUFFIXES: .eln .elc .el
+.SUFFIXES: .elc .el
# An old-fashioned suffix rule, which, according to the GNU Make manual,
# cannot have prerequisites.
@@ -357,13 +357,6 @@ compile-main: gen-lisp compile-clean
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:
@@ -400,7 +393,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: native-compile-clean
+compile-always:
find $(lisp) -name '*.elc' $(FIND_DELETE)
$(MAKE) compile
@@ -490,7 +483,7 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
$(CAL_DIR)/diary-loaddefs.el
.PHONY: bootstrap-clean distclean maintainer-clean extraclean
-bootstrap-clean: native-compile-clean
+bootstrap-clean:
find $(lisp) -name '*.elc' $(FIND_DELETE)
rm -f $(AUTOGENEL)
diff --git a/src/Makefile.in b/src/Makefile.in
index 63a4aa8..7380a87 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -790,10 +790,6 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
@$(MAKE) $(AM_V_NO_PD) -C ../lisp EMACS="$(bootstrap_exe)"\
THEFILE=$< $<c
-%.eln: %.el | bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp)
- @$(MAKE) $(AM_V_NO_PD) -C ../lisp EMACS="$(bootstrap_exe)"\
- THEFILE=$< $<n
-
## VCSWITNESS points to the file that holds info about the current checkout.
## We use it as a heuristic to decide when to rebuild loaddefs.el.
## If empty it is ignored; the parent makefile can set it to some other value.
- feature/native-comp updated (f2e6168 -> 76faab2), Andrea Corallo, 2020/08/17
- feature/native-comp 88b860e 02/12: Make comp-deferred-compilation a simple global and set it on by default, Andrea Corallo, 2020/08/17
- feature/native-comp df774c4 04/12: * Prevent recursive load, Andrea Corallo, 2020/08/17
- feature/native-comp 3224a44 01/12: Move eln files into dedicated cache directories, Andrea Corallo, 2020/08/17
- feature/native-comp 377ffdb 05/12: * Do not fail if more then one level of directories has to be created, Andrea Corallo, 2020/08/17
- feature/native-comp b6238d8 06/12: * Deferred compilation must always compile despite source file timestamp, Andrea Corallo, 2020/08/17
- feature/native-comp 40de063 09/12: * Remove a false permission related error while native compiling, Andrea Corallo, 2020/08/17
- feature/native-comp dbeafd3 03/12: Some Makefile updates and clean-up,
Andrea Corallo <=
- feature/native-comp 171db31 07/12: Make install target functional for new eln-cache directory arrangement, Andrea Corallo, 2020/08/17
- feature/native-comp da54406 08/12: Allow for native compiling .el.gz files, Andrea Corallo, 2020/08/17
- feature/native-comp 142cfe9 10/12: * Introduce `load-no-native', Andrea Corallo, 2020/08/17
- feature/native-comp 114b1d8 11/12: * test/src/comp-tests.el (comp-tests-bootstrap): Fix test for new eln setup., Andrea Corallo, 2020/08/17
- feature/native-comp 76faab2 12/12: * Improve eln filename hashing, Andrea Corallo, 2020/08/17