summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-04-20 16:26:36 +0200
committerJonas Smedegaard <dr@jones.dk>2011-04-20 16:26:36 +0200
commitae4f892e18700474e49faea6fd431135f6439fe3 (patch)
treebd2e3eaff93f462b91e6895757eb67d69a34547c
parenteccdd7a64a30d60f21e6391139cb545009a0aaf1 (diff)
parent43b97f5169f36971586a3709e8283aef59054ba8 (diff)
Merge commit 'refs/top-bases/compass' into compass
Conflicts: Makefile
-rw-r--r--Makefile17
-rw-r--r--include.mk14
2 files changed, 19 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 32e818b..a9de6e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,9 @@
-sassfiles = $(filter-out $(wildcard */_*.scss),$(wildcard */*.scss))
-cssfiles = $(sassfiles:scss=css)
+cssprojects ?= default blueview actiontabs
-compasscfgfile = $(wildcard config/config.rb)
+beautify ?= yes
-all: $(cssfiles)
+all: $(cssprojects)
-%.css: %.scss
- compass compile --sass-dir= --css-dir= $(compasscfgfile:%=-c %) --output-style expanded --relative-assets $<
- perl -i -pe 's/ /\t/g' $@
+include include.mk
-clean:
- rm -f $(cssfiles)
- rm -rf .sass-cache
-
-.PHONY: clean
+.PHONY: all
diff --git a/include.mk b/include.mk
new file mode 100644
index 0000000..58be65d
--- /dev/null
+++ b/include.mk
@@ -0,0 +1,14 @@
+cssprojectinfiles = $(foreach file,$(if $1,$(shell find $1 -name '*.scss')),$(if $(filter-out _%,$(notdir $(file))),$(file)))
+cssprojectoutfiles = $(patsubst %.scss,%.css,$(call cssprojectinfiles,$1))
+
+compasscfgfile = $(wildcard config/config.rb)
+
+$(cssprojects):
+ compass compile --sass-dir= --css-dir= $(compasscfgfile:%=-c %) $(if $(beautify),--output-style expanded) --relative-assets $(call cssprojectoutfiles,$@)
+ $(if $(beautify),perl -i -pe 's/ /\t/g' $(call cssprojectoutfiles,$@))
+
+clean::
+ rm -f $(call cssprojectoutfiles,$(cssprojects))
+ rm -rf .sass-cache
+
+.PHONY: clean $(cssprojects)