Improve compass project handling: Try compile only styling and (shared) goab by default. Git-ignore cache folders anywhere. Sync with HEAD of submodule shared.

3 files changed, 5 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index fa46c32..e4b7070 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/.sass-cache/
+*/.sass-cache/
 /build/
diff --git a/Makefile b/Makefile
index be53be3..82f01c1 100644
--- a/Makefile
+++ b/Makefile
@@ -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