From c87e51b9ff0d539dc5cb0bf1f8afafebd25efb5e Mon Sep 17 00:00:00 2001
From: Thomas Letan <lthms@soap.coffee>
Date: Wed, 19 Feb 2020 17:05:44 +0100
Subject: Rework the Makefiles for a cleaner handling of generated scripts

---
 Makefile | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6611f7d..1ce73db 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,37 @@
-SASS       := $(shell find site/ -name "*.sass")
-INPUTS     := $(SASS:.sass=.css)
-MAKEFILES  := org.mk coq.mk
-ROOT       := $(shell pwd)
+SASS := $(shell find site/ -name "*.sass")
+INPUTS := $(SASS:.sass=.css)
+MAKEFILES := org.mk coq.mk
+ROOT := $(shell pwd)
+GEN_SCRIPTS :=
 
 include ${MAKEFILES}
 
-build: ${INPUTS} soupault.conf
-	@echo "run soupault"
+build : ${INPUTS} soupault.conf
+	@echo "     run  soupault"
 	@soupault
-	@echo "update gitignore"
-	@scripts/update-gitignore.sh ${INPUTS} ${MAKEFILES}
+	@echo "  update  .gitignore"
+	@scripts/update-gitignore.sh ${INPUTS} ${MAKEFILES} ${GEN_SCRIPTS}
 
-clean:
-	@echo "remove generated makefiles"
+clean :
+	@echo "  remove  generated makefiles"
 	@rm -f ${MAKEFILES}
-	@echo "remove generated files in site/"
+	@echo "  remove  generated files in site/"
 	@rm -f ${INPUTS}
-	@echo "remove build/ directory"
+	@echo "  remove  build/ directory"
 	@rm -rf build
 
-force: clean build
+force : clean build
 
-soupault.conf: site/posts/meta/Soupault.org
-	@echo "generate soupault.conf"
-	@emacs $< --batch --eval "(org-babel-tangle)" --kill 2>/dev/null
+soupault.conf : site/posts/meta/Soupault.org
+	@echo "  tangle  $<"
+	@emacs $< --batch --eval "(org-babel-tangle)" --kill
 
-org.mk coq.mk &: site/posts/meta/Contents.org
-	@echo "generate org.mk, coq.mk"
+org.mk coq.mk scripts/export-org.el &: site/posts/meta/Contents.org
+	@echo "  tangle  $<"
 	@emacs $< --batch --eval "(org-babel-tangle)" --kill 2>/dev/null
 
-%.css: %.sass
-	@echo "compile $*.sass"
+%.css : %.sass
+	@echo " compile  $*.sass"
 	@sassc --style=compressed --sass $< $@
 
 .PHONY: clean build force
-- 
cgit v1.2.3