[css-box-3] Synchronized Makefile with the one in ../css-template

Author: bert-github

css-box/Makefile

@@ -11,52 +11,66 @@
 # Possible other options to add to the curl command below:
 # -F ids=on
 # -F omitdchtml=on
+# e.g., like this: make opts="-F ids=on -F omitdchtml=on"
 
-opts =
-
-cdate = $(shell date +%Y%m%d)
+cdate ?=
+status ?=
+group ?= CSS
+opts ?=
+target ?= Overview
+markup ?= html
 
 %.html: %.src.html
 	@echo "Calling post-processor to generate $@..."
-	@curl -K ~/.curl-w3.org -s -S -F output=html -F file=@$< -F group=CSS \
-	-F method=file -F date=$(cdate) -F status=$(status) $(opts) -o $@ \
-	https://www.w3.org/Style/Group/process.cgi
+	@curl -K ~/.curl-w3.org -s -S -F output=html -F file=@$< \
+	-F group=$(group) -F method=file -F date=$(cdate) -F status=$(status) \
+	$(opts) -o $@ https://www.w3.org/Style/Group/process.cgi
 %.err: %.src.html
 	@echo "Calling post-processor to check $<..."
-	@curl -K ~/.curl-w3.org -s -S -F output=err -F file=@$< -F group=CSS \
-	-F method=file -F date=$(cdate) -F status=$(status) $(opts) -o $@ \
-	https://www.w3.org/Style/Group/process.cgi
+	@curl -K ~/.curl-w3.org -s -S -F output=err -F file=@$< \
+	-F group=$(group) -F method=file -F date=$(cdate) -F status=$(status) \
+	$(opts) -o $@ https://www.w3.org/Style/Group/process.cgi
+%.html: %.bs
+	curl -s -L -F file=@$< -F time=$(cdate) -F output=html \
+	-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
+%.err: %.bs
+	curl -s -L -F file=@$< -F time=$(cdate) -F output=err \
+	-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
 
 # For Dispositions of Comments in css3-background:
 %.html: %.txt; awk -f issues-txt-to-html.awk $< >$@
 
+# Rule to create PNG from FIG
+%.png: %.fig; fig2dev -L png -m 0.8 -S 4 $< $@
+
 # Rule to create EPS from FIG
 %.eps: %.fig; fig2dev -m 0.8 -L eps -F -c $< $@
 
-# Rule to create raster image versions of EPS images
+# Rule to create PNG from EPS
 %.png: %.eps; convert -density 96x96 $< $@
 
 
-all: check Overview.html
+all: check $(target).html
 
 # egrep will exit with a zero exit code if there is anything left
-check: Overview.err
+check: $(target).err
 	@cat $<
-	@if egrep -v '^(Warning:|\(Processed in .* seconds\)|No errors)' $<;\
+	@if egrep -qv '^(Warning:|\(Processed in .* seconds\)|No errors)' $<;\
 	 then false; else true; fi
 
 
 # A handy shortcut:
 
 commit: update all
-	hg commit -m 'Generated. Do not edit!' Overview.html || true
+	hg commit -m 'Generated. Do not edit!' $(target).html || true
 	hg push
 
 update:
-	hg pull -u
+	hg pull
+	hg update
 
 clean:
-	rm -f Overview.html Overview.err
+	rm -f $(target).html $(target).err