From 9dde3fcba1b4f10fedcb7cf8b981ded46a0f3e43 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 11 Feb 2015 14:33:23 -0800 Subject: [PATCH] add helm, f, s, and a bunch of other libraries --- emacs_el/.mrconfig | 10 ++++++++++ emacs_el/Makefile | 18 +++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/emacs_el/.mrconfig b/emacs_el/.mrconfig index 14dfe4d..4da11de 100644 --- a/emacs_el/.mrconfig +++ b/emacs_el/.mrconfig @@ -2,3 +2,13 @@ checkout = git clone http://git.donarmstrong.com/org-ref.git org-ref [web-mode] checkout = git clone https://github.com/fxbois/web-mode.git web-mode +[helm] +checkout = git clone https://github.com/emacs-helm/helm.git helm +[helm-bibtex] +checkout = git clone https://github.com/tmalsburg/helm-bibtex.git helm-bibtex +[parsebib] +checkout = git clone https://github.com/joostkremers/parsebib.git parsebib +[s-el] +checkout = git clone https://github.com/magnars/s.el.git s-el +[f-el] +checkout = git clone https://github.com/rejeep/f.el.git f-el \ No newline at end of file diff --git a/emacs_el/Makefile b/emacs_el/Makefile index c79737e..cfd61b4 100644 --- a/emacs_el/Makefile +++ b/emacs_el/Makefile @@ -8,18 +8,26 @@ ifeq ($(strip $(WHICH_EMACS)),) ELC_FILES=$(patsubst %.el,%.elc,$(wildcard *.el)) endif -all: $(ELC_FILES) configuration +SUBDIRS= +LIBOPTS=-L . +ifeq ($(strip $(WHICH_EMACS)),) +SUBDIRS=configuration helm org-ref +LIBDIRS=-L . -L helm +endif + + +all: $(ELC_FILES) $(SUBDIRS) EMACS=emacs -configuration: - $(MAKE) -C configuration +$(SUBDIRS): %: + $(MAKE) -C $@ %.elc: %.el - $(EMACS) -q -no-site-file -L . --no-site-file -batch -f batch-byte-compile $<; + $(EMACS) -q -no-site-file $(LIBDIRS) --no-site-file -batch -f batch-byte-compile $<; clean: rm -f *.elc -.PHONY: clean all configuration +.PHONY: clean all $(SUBDIRS) -- 2.39.2