aboutsummaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorGravatar Tom Willemse2019-02-28 21:37:28 -0800
committerGravatar Tom Willemse2019-02-28 21:37:28 -0800
commit17a41e0a2dd0f8ad7ad70aae9bff50c93f333695 (patch)
tree42160cdcb8cb06decffbd376c7c2a4a8312365a5 /emacs
parent172074dba6580767893751c16f5cd9fc67634fcb (diff)
downloadnew-dotfiles-17a41e0a2dd0f8ad7ad70aae9bff50c93f333695.tar.gz
new-dotfiles-17a41e0a2dd0f8ad7ad70aae9bff50c93f333695.zip
Remove site-lisp
Everything has been moved to other projects
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/GNUmakefile15
-rw-r--r--emacs/.emacs.d/init.el3
2 files changed, 1 insertions, 17 deletions
diff --git a/emacs/.emacs.d/GNUmakefile b/emacs/.emacs.d/GNUmakefile
index 738090d..ef779bb 100644
--- a/emacs/.emacs.d/GNUmakefile
+++ b/emacs/.emacs.d/GNUmakefile
@@ -3,34 +3,21 @@ EMACS := emacs
.SECONDARY:
-AUTOLOADS_FILE := site-lisp/oni-site-autoloads.el
-UNWANTED := $(AUTOLOADS_FILE) site-lisp/flycheck_% site-lisp/flycheck-%
-SITE_LISPS := $(filter-out $(UNWANTED),$(wildcard site-lisp/*.el))
-COMPILED_SITE_LISPS := $(addsuffix c,$(SITE_LISPS))
VENDOR_DIRS := $(wildcard vendor-lisp/*)
BASE_DIR := $(CURDIR)
.PHONY: all snippets
-all: $(COMPILED_SITE_LISPS) init.elc $(AUTOLOADS_FILE) snippets
+all: init.elc snippets
%.elc: %.el
@echo -e "\e[31mELC\e[0m $<"
@$(EMACS) -batch \
- -directory "$(HOME)/.emacs.d/site-lisp" \
-directory "$(HOME)/.emacs.d/vendor-lisp/emacs-slack" \
-directory "$(HOME)/.emacs.d/vendor-lisp/circe" \
-directory "$(HOME)/.emacs.d/vendor-lisp/circe-serenity" \
-eval "(package-initialize)" \
-eval "(byte-compile-file \"$<\")"
-### Site Lisp
-
-$(AUTOLOADS_FILE): $(COMPILED_SITE_LISPS)
- @echo -e "\e[32mGEN\e[0m $@"
- @$(EMACS) -batch \
- -eval "(setq generated-autoload-file \"$(BASE_DIR)/$@\")" \
- -eval "(update-directory-autoloads \"$(BASE_DIR)/site-lisp/\")"
-
### Snippets
SNIPPET_DIRS = $(wildcard snippets/*)
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 2737c51..119a3da 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -31,15 +31,12 @@
(let ((load-directory
(file-name-directory
(or load-file-name byte-compile-current-file))))
- (add-to-list 'load-path (format "%ssite-lisp/" load-directory))
(add-to-list 'load-path (format "%sos-lisp/" load-directory))
(mapc (lambda (d) (add-to-list 'load-path d))
(directory-files
(format "%svendor-lisp/" load-directory) t "^[^.]"))))
-(load "oni-site-autoloads" :noerror :nomessage)
-
(require 'package)
(eval-and-compile (package-initialize))