From 0f10451eef8d826ffb31f70f8a6c2db36ebc16a5 Mon Sep 17 00:00:00 2001 From: "Pedro A. Aranda" Date: Sun, 10 Mar 2024 12:06:28 +0100 Subject: [PATCH 4/4] Add cleaning native compilation --- lisp/Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lisp/Makefile b/lisp/Makefile index c570d9cfa..1f03539c2 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -10,13 +10,16 @@ LISPB := $(LISPA:%el=%elc) org-install.elc LISPF := $(filter-out $(LISPA),$(sort $(wildcard *.el))) LISPC := $(filter-out $(LISPB) $(LISPN:%el=%elc),$(LISPF:%el=%elc)) LISPN := $(filter-out $(LISPB) $(LISPN:%el=%eln),$(LISPF:%el=%eln)) +# Should not be empty if lisp//org-lint.eln exists +# like after a make native +ELNDIR := $(shell find . -name org-lint\*.eln -exec dirname {} \;) _ORGCM_ := dirall single native source slint1 slint2 -include local.mk .PHONY: all compile compile-dirty \ $(_ORGCM_) $(_ORGCM_:%=compile-%) \ autoloads \ - install clean cleanauto cleanall cleanelc clean-install + install clean cleanauto cleanall cleanelc cleaneln clean-install # do not clean here, done in toplevel make all compile compile-dirty:: | autoloads @@ -41,7 +44,7 @@ single: @$(info ==================== $@ ====================) native: @$(info ==================== $@ ====================) -source: cleanelc +source: cleanelc cleaneln @$(info ==================== $@ ====================) @$(foreach elc,$(LISPC),$(MAKE) $(elc) && $(RM) $(elc);) slint1: @@ -78,6 +81,14 @@ cleanauto clean cleanall:: $(RM) $(LISPA) $(LISPB) clean cleanall cleanelc:: $(RM) *.elc +ifeq ($(ELNDIR),) +cleaneln:: + @-echo "No previous native compilation " +else +clean cleanall cleaneln:: + @-echo "Removing previous native compilation" + @$(RM) -rf $(ELNDIR) +endif clean-install: if [ -d $(DESTDIR)$(lispdir) ] ; then \ -- 2.34.1