summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-03-01 01:39:19 +0100
committerJonas Smedegaard <dr@jones.dk>2012-03-01 01:58:16 +0100
commit109fdb263c35da12709c40b0e6f532907485ecbf (patch)
tree0d679e97ea50e3e9118119d80edd53e656d96e10
parentfafad703a35ca1e930479d0d864034957625bbce (diff)
Restructure submodules and config targets dependency handling (now use -B to force rebuilding).
-rw-r--r--Makefile16
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