From a031c80ba809ea733da56d4e68d838e08a2ba224 Mon Sep 17 00:00:00 2001
From: Thomas Letan <lthms@soap.coffee>
Date: Sun, 23 Feb 2020 19:04:41 +0100
Subject: Yet another attempt to only init npm and Emacs when necessary

---
 .gitignore                      |  6 +++---
 Makefile                        |  1 +
 site/cleopatra/Bootstrap.org    |  8 ++++++--
 site/cleopatra/Contents/Org.org |  4 ++--
 site/cleopatra/Soupault.org     | 10 +++-------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90013bb..a5f8380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,8 +34,6 @@ coq.mk
 org.mk
 scripts/packages.el
 scripts/export-org.el
-.emacs
-emacs.d/
 soupault.mk
 soupault.conf
 package.json
@@ -45,9 +43,11 @@ plugins/urls-rewriting.lua
 scripts/katex.js
 scripts/history.sh
 package-lock.json
-node_modules/
 theme.mk
 templates/main.html
+.emacs
+emacs.d/
+node_modules/
 site/style/coq.sass
 site/style/coq.sass
 site/style/org.sass
diff --git a/Makefile b/Makefile
index 364a8f2..166274a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ ROOT := $(shell pwd)
 CLEODIR := site/cleopatra
 
 GENFILES :=
+GENAUX :=
 CONTENTS :=
 GENSASS :=
 
diff --git a/site/cleopatra/Bootstrap.org b/site/cleopatra/Bootstrap.org
index d1386d7..8171a1d 100644
--- a/site/cleopatra/Bootstrap.org
+++ b/site/cleopatra/Bootstrap.org
@@ -87,7 +87,9 @@ their output files (using ~+=~).
 
 - ~GENFILES~ ::
   List *~cleopatra~* Makefiles and scripts tangled throughout the generation
-  process (with the notable exception of ~Makefile~ itself).
+  process.
+- ~GENAUX~ ::
+  List auxiliary files and directories used by the generation processes.
 - ~GENSASS~ ::
   List auxiliary ~sass~ files which can later be imported by the main ~sass~
   files (see [[./Theme.org][“Theming and Templating”]]).
@@ -97,6 +99,7 @@ their output files (using ~+=~).
 
 #+BEGIN_SRC makefile :tangle Makefile :exports none
 GENFILES :=
+GENAUX :=
 CONTENTS :=
 GENSASS :=
 #+END_SRC
@@ -298,6 +301,7 @@ build : ${CONTENTS} ${GENFILES}
 	@scripts/update-gitignore.sh \
 	     ${CONTENTS} \
 	     ${GENFILES} \
+	     ${GENAUX} \
 	     ${GENSASS} \
 	     build.log
 #+END_SRC
@@ -333,7 +337,7 @@ clean :
 
 cleanall : clean
 	@echo "  remove  everything else"
-	@rm -rf ${GENSASS} ${GENFILES}
+	@rm -rf ${GENSASS} ${GENFILES} ${GENAUX}
 
 force : clean build
 
diff --git a/site/cleopatra/Contents/Org.org b/site/cleopatra/Contents/Org.org
index 856a002..7dc368c 100644
--- a/site/cleopatra/Contents/Org.org
+++ b/site/cleopatra/Contents/Org.org
@@ -61,7 +61,7 @@ EXPORT := --directory="${ROOT}/scripts/" --batch \
 INIT := --batch --load="${ROOT}/scripts/packages.el" \
         2>> build.log
 
-.emacs emacs.d/ &: scripts/packages.el
+.emacs : scripts/packages.el
 	@echo "    init  emacs configuration"
 	@${EMACS} ${INIT}
 	@touch .emacs
@@ -71,7 +71,7 @@ INIT := --batch --load="${ROOT}/scripts/packages.el" \
 	@${EMACS} $< ${EXPORT}
 
 CONTENTS += $(ORG_POSTS:.org=.html)
-GENFILES += .emacs emacs.d/
+GENAUX += .emacs emacs.d/
 #+END_SRC
 
 #+BEGIN_SRC sass :tangle site/style/org.sass
diff --git a/site/cleopatra/Soupault.org b/site/cleopatra/Soupault.org
index bc49bb8..2ff6ab6 100644
--- a/site/cleopatra/Soupault.org
+++ b/site/cleopatra/Soupault.org
@@ -264,16 +264,12 @@ console.log(html)
 #+END_SRC
 
 #+BEGIN_SRC makefile :tangle soupault.mk
-package-lock.json node_modules/ &:: package.json
+package-lock.json : package.json
 	@echo "    init  npm packages"
 	@npm install
-#+END_SRC
-
-The use of ~::~ in place of ~:~ tells ~make~ to use this receipes
-unconditionally.
 
-#+BEGIN_SRC makefile :tangle soupault.mk
-GENFILES += package-lock.json node_modules/
+GENFILES += package-lock.json
+GENAUX += node_modules/
 #+END_SRC
 
 #+BEGIN_SRC toml :tangle soupault.conf
-- 
cgit v1.2.3