From ff52474a76efe7c8e67603938e2cd5fa6f2a8daa Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Tue, 30 Jan 2018 17:07:43 -0800 Subject: [PATCH] switch to directly byte-compiling files, use install_package.el --- emacs_el/configuration/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/emacs_el/configuration/Makefile b/emacs_el/configuration/Makefile index 667985f..411771e 100644 --- a/emacs_el/configuration/Makefile +++ b/emacs_el/configuration/Makefile @@ -7,23 +7,25 @@ ELC_FILES= EL_FILES= ORG_EL_FILES= ifeq ($(strip $(WHICH_EMACS)),) -ORG_EL_FILES=$(patsubst %.org,%.el,$(wildcard *.org)) -ORG_ELC_FILES=$(patsubst %.org,%.elc,$(wildcard *.org)) -EL_FILES=$(sort $(wildcard *.el) $(ORG_EL_FILES)) -ELC_FILES=$(patsubst %.el,%.elc,$(EL_FILES)) +ORG_EL_FILES=don-configuration.el +ORG_ELC_FILES=don-configuration.elc endif -LIB_PATH=-L . -L .. -L ../helm +LIB_PATH= all: $(ORG_ELC_FILES) EMACS=emacs -$(ELC_FILES): %.elc: %.el - $(EMACS) -batch -q -no-site-file $(LIB_PATH) --no-site-file --eval '(byte-recompile-directory "." 0)' +install_packages: install_packages.el + $(EMACS) --batch -q --no-site-file $(LIB_PATH) -l install_packages.el && \ + touch $@ -$(ORG_EL_FILES): %.el: %.org - $(EMACS) -batch -q -no-site-file --visit $< --funcall org-babel-tangle +$(ORG_ELC_FILES): %.elc: %.el install_packages + $(EMACS) --batch -q --no-site-file $(LIB_PATH) $(USE_PACKAGE) --eval "(byte-compile-file \"$<\")" + +$(ORG_EL_FILES): %.el: %.org install_packages + $(EMACS) --batch -q --no-site-file --visit $< --funcall org-babel-tangle clean: -- 2.39.2