switch to directly byte-compiling files, use install_package.el

diff --git a/emacs_el/configuration/Makefile b/emacs_el/configuration/Makefile
index 667985fced378caa5f4efaa1d2f4380a831c72b0..411771e785102962af7030c06d1fc49921491c08 100644 (file)
--- 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: