Restructure submodules and config targets dependency handling (now use -B to force rebuilding).

1 files changed, 8 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 85f3dda..7f98f02 100644
--- a/Makefile
+++ b/Makefile
@@ -14,24 +14,24 @@ all: build
 always-make = $(filter -B,$(MAKEFLAGS))
 avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo " --no-rcs")
 
-init: submodules content
-	$(MAKE) -B config
+init: config content
 
-submodules:
+shared/.git:
 	git submodule init
 	git submodule update --init --recursive
 
 config: setupfiles = $(wildcard $@/*.setup)
-config: submodules
+config: shared/.git
 	$(if $(setupfiles),,mkdir -p '$@')
 	$(if $(setupfiles),,ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup '$@/ikiwiki.setup')
 
-content: submodules
-	mkdir -p '$@'
-	[ -e '$@/index.mdwn' ] || printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn'
+content: notempty = $(wildcard $@/*.mdwn)
+content: shared/.git
+	$(if $(notempty),,mkdir -p '$@')
+	$(if $(notempty),,printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn')
 
 build:
 	$(if $(cssprojects),$(MAKE) $(cssprojects))
 	$(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild);)
 
-.PHONY: all build submodules content
+.PHONY: all build