From b5208772907735a011fe2c9c5898d5c0e2858225 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 3 Nov 2023 10:22:23 -0400 Subject: [PATCH] Makefile.am: factor our the "scour" command into a macro --- Makefile.am | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0e76e8c..2ddde99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,13 @@ PRECIOUS_IDS = \ tickettime \ zone +SCOUR = @SCOUR@ --enable-id-stripping \ + --enable-comment-stripping \ + --remove-descriptive-elements \ + --no-renderer-workaround \ + --no-line-breaks \ + --error-on-flowtext + # Optimize our SVG once using XSL, to catch a few things # that "scour" misses. tableau.min.svg: tableau.svg svgclean.xsl @@ -33,15 +40,9 @@ tableau.min.svg: tableau.svg svgclean.xsl # Optimize our SVG again, and remove its XML prologue so that it can # be included directly into the HTML document. tableau.min.min.svg: tableau.min.svg - @SCOUR@ --protect-ids-list=$$(echo $(PRECIOUS_IDS) | tr ' ' ',') \ - --enable-id-stripping \ - --enable-comment-stripping \ - --remove-descriptive-elements \ - --no-renderer-workaround \ - --strip-xml-prolog \ - --no-line-breaks \ - --error-on-flowtext \ - $< > $@ + $(SCOUR) --protect-ids-list=$$(echo $(PRECIOUS_IDS) | tr ' ' ',') \ + --strip-xml-prolog \ + $< > $@ # Use FontForge to convert the sfd source files to woff2. .sfd.woff2: -- 2.44.2