Expand Makefile

2 files changed, 44 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 31d5d61..9851b7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-/bog-autoloads.el
+*-autoloads.el
+*.elc
 
 # Needed for `make test`
 .downloads
diff --git a/Makefile b/Makefile
index ae2638a..5498024 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,50 @@
-EMACS := emacs
-CURL := curl --silent
+EMACS = emacs -Q --batch
+CURL = curl --silent
+name = bog
+main_el :=  $(name).el
+main_elc =  $(main_el)c
+AUTOLOADS_FILE := $(name)-autoloads.el
 
-DASH_URL := https://raw.githubusercontent.com/magnars/dash.el/master/dash.el
+DASH_URL = https://raw.githubusercontent.com/magnars/dash.el/master/dash.el
 
-.PHONY: test
+all: elc autoloads
+
+.PHONY: autoloads
+autoloads: $(AUTOLOADS_FILE)
+
+$(AUTOLOADS_FILE): $(main_el) .downloads
+	@$(EMACS) -L . --eval \
+	"(let (make-backup-files) \
+	  (update-file-autoloads \"$(CURDIR)/$<\" t \"$(CURDIR)/$@\"))"
+
+.PHONY: clean
+clean:
+	$(RM) $(main_elc) $(AUTOLOADS_FILE)
+
+.PHONY: elc
+elc: $(main_elc)
 
+.PHONY: help
+help:
+	@printf "\nMain targets:\n\n"
+	@printf "  all                Byte compile and generate autoloads.\n"
+	@printf "  autoloads          Generate $(AUTOLOADS_FILE).\n"
+	@printf "  elc                Byte compile $(main_el).\n"
+	@printf "\nOther:\n\n"
+	@printf "  clean              Remove generated files.\n"
+	@printf "  help               Print this message.\n"
+	@printf "  test               Run tests.\n"
+
+.PHONY: test
 test: .downloads
-	${EMACS} -Q --batch -L . \
-		-l bog-tests \
-		--eval "(ert-run-tests-batch-and-exit '(not (tag interactive)))"
+	@$(EMACS) -L . -l bog-tests \
+	--eval "(ert-run-tests-batch-and-exit '(not (tag interactive)))"
+
+%.elc: %.el .downloads
+	@$(EMACS) -L . -f batch-byte-compile $<
+
 
 .downloads:
-	${CURL} ${DASH_URL} > dash.el
+	$(CURL) $(DASH_URL) > dash.el
 	touch .downloads
 
-clean:
-	@rm -rf  *.elc