Merge branch 'straight-next'

[~bandali/configs] / Makefile

diff --git a/Makefile b/Makefile
index 3521a23..3b3a23f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,19 @@
--include lib/borg/borg.mk
+EMACS           ?= emacs
+EMACS_ARGUMENTS ?= -Q
 
-bootstrap-borg:
-       @git submodule--helper clone --name borg --path lib/borg \
-       --url git@github.com:emacscollective/borg.git
-       @cd lib/borg; git symbolic-ref HEAD refs/heads/master
-       @cd lib/borg; git reset --hard HEAD
+.PHONY: all help clean build build-init quick bootstrap
+.FORCE:
 
-ta: tangle-init all
+tangle-init: init.el
+init.el: init.org
+       @$(EMACS) $(EMACS_ARGUMENTS) \
+       --batch --load org \
+       --eval '(org-babel-tangle-file "init.org")' 2>&1
 
-ti: tangle-init build-init
+build-init:
+       @rm -f init.elc
+       @$(EMACS) $(EMACS_ARGUMENTS) \
+       --batch -l init.el --eval '(a/build-init)' 2>&1
+
+ti: tangle-init
+bi: build-init