ryuslash/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove reference to init/ everything has been moved to emacs-config

Browse source
This commit is contained in:
Tom Willemse 2019-02-28 21:23:44 -08:00
parent 481ceb9295
commit f18002d662
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
emacs/.emacs.d/GNUmakefile
View file

@ -7,14 +7,11 @@ AUTOLOADS_FILE := site-lisp/oni-site-autoloads.el
UNWANTED := $(AUTOLOADS_FILE) site-lisp/flycheck_% site-lisp/flycheck-% UNWANTED := $(AUTOLOADS_FILE) site-lisp/flycheck_% site-lisp/flycheck-%
SITE_LISPS := $(filter-out $(UNWANTED),$(wildcard site-lisp/*.el)) SITE_LISPS := $(filter-out $(UNWANTED),$(wildcard site-lisp/*.el))
COMPILED_SITE_LISPS := $(addsuffix c,$(SITE_LISPS)) COMPILED_SITE_LISPS := $(addsuffix c,$(SITE_LISPS))
INIT_LISPS := $(wildcard init/*.el)
COMPILED_INIT_LISPS := $(addsuffix c,$(INIT_LISPS))
VENDOR_DIRS := $(wildcard vendor-lisp/*) VENDOR_DIRS := $(wildcard vendor-lisp/*)
BASE_DIR := $(CURDIR) BASE_DIR := $(CURDIR)
.PHONY: all snippets .PHONY: all snippets
all: $(COMPILED_SITE_LISPS) init.elc $(COMPILED_INIT_LISPS) \ all: $(COMPILED_SITE_LISPS) init.elc $(AUTOLOADS_FILE) snippets
$(AUTOLOADS_FILE) snippets
%.elc: %.el %.elc: %.el
@echo -e "\e[31mELC\e[0m $<" @echo -e "\e[31mELC\e[0m $<"

1
emacs/.emacs.d/init.el
View file

@ -31,7 +31,6 @@
(let ((load-directory (let ((load-directory
(file-name-directory (file-name-directory
(or load-file-name byte-compile-current-file)))) (or load-file-name byte-compile-current-file))))
(add-to-list 'load-path (format "%sinit/" load-directory))
(add-to-list 'load-path (format "%ssite-lisp/" load-directory)) (add-to-list 'load-path (format "%ssite-lisp/" load-directory))
(add-to-list 'load-path (format "%sos-lisp/" load-directory)) (add-to-list 'load-path (format "%sos-lisp/" load-directory))

2
emacs/.emacs.d/windows.mk
View file

@ -9,7 +9,7 @@ SITE_LISPS := $(SITE_LISPS) os-lisp/oni-windows-nt.el
COMPILED_SITE_LISPS := $(COMPILED_SITE_LISPS) os-lisp/oni-windows-nt.elc COMPILED_SITE_LISPS := $(COMPILED_SITE_LISPS) os-lisp/oni-windows-nt.elc
ALL_LISPS := init.el init.elc $(SITE_LISPS) $(COMPILED_SITE_LISPS) \ ALL_LISPS := init.el init.elc $(SITE_LISPS) $(COMPILED_SITE_LISPS) \
$(INIT_LISPS) $(COMPILED_INIT_LISPS) $(AUTOLOADS_FILE) $(AUTOLOADS_FILE)
install: install:
for file in $(ALL_LISPS); do \ for file in $(ALL_LISPS); do \