From a5416d9d7f51f7785e98a8e67e77685f4d123ebd Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Tue, 5 Jul 2016 14:27:14 +0200 Subject: Move css into root ..allows to specify realtive font path's that are usable with and without compiling the css --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f7f4008..9c344ba 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ versioned_png = 's/.*/.png?&/' version_args = --stringparam versioned_jpg $(shell echo $(version) | sed $(versioned_jpg)) --stringparam versioned_png $(shell echo $(version) | sed $(versioned_png)) -xsltproc=xsltproc --stringparam stylesheet "$(shell cat style/style.min.css)" --stringparam version $(version) $(version_args) +xsltproc=xsltproc --stringparam stylesheet "$(shell cat style.min.css)" --stringparam version $(version) $(version_args) svg2png=rsvg-convert -f png fix_doctype=sed 's/ SYSTEM "about:legacy-compat"//' @@ -24,7 +24,7 @@ pages=$(shell xsltproc xsl/main_filenames.xsl main.xml) pages_gen=$(pages:%.xml=%$(suffix)) pages_gen_html=$(pages:%.xml=%.html) -common_depend=main.xml $(wildcard xsl/*.xsl) Makefile checkmark.svg style/style.min.css minify_html.sed +common_depend=main.xml $(wildcard xsl/*.xsl) Makefile checkmark.svg style.min.css minify_html.sed DEFAULT_VERBOSITY=0 @@ -43,7 +43,7 @@ v_css_0 = @echo " CSS " $@; .PHONY: all html -all: $(pages_gen) checkmark.png style/style.min.css +all: $(pages_gen) checkmark.png style.min.css html: $(pages_gen_html) @@ -62,8 +62,8 @@ html: $(pages_gen_html) %.html: %.xml $(common_depend) $(V_XSLT) $(xsltproc) --stringparam suffix .html $< | $(to_html) | $(html_minify) > $@ -style/style.min.css: style/style.css style/font.css - $(V_CSS) node_modules/.bin/postcss -u postcss-import -u postcss-css-variables style/style.css | node_modules/.bin/cleancss > style/style.min.css +style.min.css: style.css font.css + $(V_CSS) node_modules/.bin/postcss -u postcss-import -u postcss-css-variables style.css | node_modules/.bin/cleancss > style.min.css clean: rm -f $(pages_gen) checkmark.png -- cgit