diff -r c91175610f8a -r 0efdafd23753 www/Makefile --- a/www/Makefile Thu Sep 05 14:43:04 2019 +0200 +++ b/www/Makefile Thu Sep 05 20:14:16 2019 +0200 @@ -25,17 +25,47 @@ jqwidgets/styles/images/* jqwidgets/globalization/* js/* \ includes/* fpdf/* import/* OTHER = Makefile +CSS_FILES = $(filter-out %-min.css,$(wildcard \ + css/*.css \ + css/**/*.css \ +)) +JS_FILES = $(filter-out %-min.js,$(wildcard \ + js/*.js \ + js/**/*.js \ +)) + +YUI_COMPRESSOR = yui-compressor +YUI_COMPRESSOR_FLAGS = --charset utf-8 --verbose + +CSS_MINIFIED = $(CSS_FILES:.css=-min.css) +JS_MINIFIED = $(JS_FILES:.js=-min.js) + + ############################################################################# .c.o: ${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -c $< -all: +all: minify-css minify-js clean: rm -f version.php +minify-css: $(CSS_FILES) $(CSS_MINIFIED) +minify-js: $(JS_FILES) $(JS_MINIFIED) + +%-min.css: %.css + @echo '==> Minifying $<' + $(YUI_COMPRESSOR) $(YUI_COMPRESSOR_FLAGS) --type css $< >$@ + @echo + +%-min.js: %.js + @echo '==> Minifying $<' + $(YUI_COMPRESSOR) $(YUI_COMPRESSOR_FLAGS) --type js $< >$@ + @echo + + install: ${INSTALL} -d -g 314 -o 314 ${PREFIX} ${WWWDIR} ${WWWDIR}/css ${WWWDIR}/fpdf \ ${WWWDIR}/fpdf/font \