diff -r 4415a30b5a36 -r fa82e95d9ddd www/Makefile --- a/www/Makefile Mon Jul 15 15:06:17 2019 +0200 +++ b/www/Makefile Sat Sep 14 10:30:26 2019 +0200 @@ -14,6 +14,7 @@ prod_archive_code.php prod_archive_date.php prod_archive_name.php prod_beerxml.php \ prod_checklist.php prod_duplicate.php prod_edit.php prod_export.php prod_forum.php \ prod_impbrew.php prod_inprod.php prod_new.php prod_print.php prod_torecipe.php \ + prod_r_efficiency.php prod_r_yeast.php prod_r_totals.php \ profile_fermentation.php profile_mash.php profile_setup.php profile_styles.php \ profile_water.php \ rec_beerxml.php rec_duplicate.php rec_edit.php rec_export.php rec_forum.php \ @@ -24,16 +25,39 @@ 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 + rm -f version.php ${CSS_MINIFIED} ${JS_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 \