diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| m--------- | shared | 0 |
3 files changed, 5 insertions, 5 deletions
@@ -1,2 +1,2 @@ -/.sass-cache/ +*/.sass-cache/ /build/ @@ -3,10 +3,11 @@ IKIWIKI_OPTIONS ?= \ --set destdir='$(CURDIR)/build/html' \ $(IKIWIKI_SHARED_OPTIONS) $(IKIWIKI_CONFIG_OPTIONS) +cssprojects ?= $(wildcard shared/themes/goab styling) + -include shared/include.mk -include config/include.mk - --include shared/themes/Makefile +-include shared/themes/include.mk always-make = $(filter -B,$(MAKEFLAGS)) avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo --no-rcs) @@ -14,7 +15,6 @@ avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || all: build init: submodules content - -$(MAKE) -C shared/themes -B $(MAKE) -B config submodules: @@ -30,7 +30,7 @@ content: submodules mkdir -p '$@' [ -e '$@/index.mdwn' ] || printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn' -build: $(cssfiles) +build: $(cssprojects) find config -name *.setup -exec ikiwiki --setup '{}' $(avoid-broken-git) $(if $(always-make),--rebuild) ';' .PHONY: all build submodules content diff --git a/shared b/shared -Subproject 52c442ff0ee2d53023de251fe59bd09d6eee731 +Subproject 486d7ebeaef60874180e70912e8584f6ec5c263 |