--- a/www/Makefile Fri Oct 18 13:20:35 2019 +0200
+++ b/www/Makefile Fri May 01 16:37:31 2020 +0200
@@ -3,15 +3,18 @@
include ../Makefile.global
-SRC = cmd_fermenter.php cmd_co2meter.php \
- config.php.dist crontasks.php favicon.ico gen_about.php \
+SRC = cmd_fermenter.php cmd_co2meter.php cmd_ispindel.php config.php.dist crontasks.php \
+ export_equipments.php export_fermentables.php export_hops.php export_mashs.php \
+ export_miscs.php export_styles.php export_suppliers.php export_waters.php \
+ export_yeasts.php favicon.ico gen_about.php \
getbrewlog.php getco2meter.php getco2pressurelog.php getfermentablesources.php \
getfermenter.php getfermentlog.php gethopsources.php getmiscsources.php getnode.php \
- getwatersources.php getyeastsources.php import_ingredients.php index.php \
+ getwatersources.php getyeastsources.php getispindel.php getispindellog.php \
+ import_ingredients.php index.php \
inv_equipments.php inv_fermentables.php inv_hops.php inv_instock.php \
- inv_miscs.php inv_suppliers.php inv_waters.php inv_yeasts.php \
- log_brew.php log_co2pressure.php log_fermentation.php \
- mon_brewer.php mon_co2meter.php mon_fermenter.php mon_node.php \
+ inv_miscs.php inv_suppliers.php inv_waters.php inv_yeasts.php inv_yeastlab.php \
+ log_brew.php log_co2pressure.php log_fermentation.php log_ispindel.php \
+ mon_brewer.php mon_co2meter.php mon_fermenter.php mon_ispindel.php mon_node.php \
prod_archive_code.php prod_archive_date.php prod_archive_name.php prod_beerxml.php \
prod_checklist.php prod_divide.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 \
@@ -27,12 +30,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,38 +42,34 @@
.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 \
+ ${WWWDIR}/fpdf/font ${WWWDIR}/ispindel \
${WWWDIR}/jqwidgets ${WWWDIR}/js ${WWWDIR}/images/ ${WWWDIR}/includes/
${INSTALL} -d -g 314 -o 314 -m 0777 ${WWWDIR}/run
${INSTALL} -d -g 314 -o 314 ${WWWDIR}/log
${INSTALL} -d -g 314 -o 314 ${WWWDIR}/log/brews
${INSTALL} -d -g 314 -o 314 ${WWWDIR}/log/fermentation
+ ${INSTALL} -d -g 314 -o 314 ${WWWDIR}/log/co2pressure
+ ${INSTALL} -d -g 314 -o 314 ${WWWDIR}/log/ispindel
${INSTALL} -g 314 -o 314 -m 0644 ${SRC} ${WWWDIR}/
${INSTALL} -g 314 -o 314 -m 0644 version.php ${WWWDIR}/
${INSTALL} -g 314 -o 314 -m 0644 css/* ${WWWDIR}/css/
${INSTALL} -g 314 -o 314 -m 0644 images/* ${WWWDIR}/images/
${INSTALL} -g 314 -o 314 -m 0644 includes/* ${WWWDIR}/includes/
+ ${INSTALL} -g 314 -o 314 -m 0644 ispindel/* ${WWWDIR}/ispindel/
cp -r jqwidgets/* ${WWWDIR}/jqwidgets/
chown -R 314:314 ${WWWDIR}/jqwidgets
cp -r -p fpdf/* ${WWWDIR}/fpdf/