diff -r c6021dd94afb -r 35675eadc655 www/Makefile --- a/www/Makefile Fri Oct 18 13:09:37 2019 +0200 +++ b/www/Makefile Fri Oct 18 16:21:54 2019 +0200 @@ -27,12 +27,10 @@ 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) @@ -41,25 +39,18 @@ .c.o: ${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -c $< -all: minify-css minify-js +all: minify-css clean: - rm -f version.php ${CSS_MINIFIED} ${JS_MINIFIED} + rm -f version.php ${CSS_MINIFIED} 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 \