X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile.am;h=bb9c10c629166144092b6b50034700bc9c49d9be;hb=54ca5b331e84be105e726895a8ccc01ce7f03ec2;hp=79d26a835e85473b1ecff57e91d05f6979907b8f;hpb=d27b50f7961732d7dfbdef3af6d0f07516bccb0b;p=charm-bypass.git

diff --git a/Makefile.am b/Makefile.am
index 79d26a8..bb9c10c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,50 +5,72 @@ PRECIOUS_IDS =  \
   bus           \
   city          \
   citycopy      \
+  codebg        \
   codetext      \
   clouds        \
   cloudscopy    \
+  destination   \
+  origin        \
+  origindest    \
   train         \
   tram          \
   trees         \
   treescopy     \
-  serviceletter \
+  serviceid     \
   servicename   \
   sky           \
   ticket        \
+  ticketbg      \
   ticketdate    \
-  tickettime
+  tickettime    \
+  zone
 
-# Optimize our SVG, and remove its XML prologue so that it can be
-# included directly into the HTML document.
-tableau.min.svg: tableau.svg
-	@SCOUR@ --protect-ids-list=$$(echo $(PRECIOUS_IDS) | tr ' ' ',') \
-                --enable-id-stripping \
+SCOUR = @SCOUR@ --enable-id-stripping \
                 --enable-comment-stripping \
                 --remove-descriptive-elements \
                 --no-renderer-workaround \
-                --strip-xml-prolog \
                 --no-line-breaks \
-                --error-on-flowtext \
-                $< > $@
+                --error-on-flowtext
+
+# Optimize the favicon just like we do the tableau.
+favicon.min.svg: favicon.svg
+	$(SCOUR) $< > $@
+
+# Optimize our SVG once using XSL, to catch a few things
+# that "scour" misses.
+tableau.min.svg: tableau.svg svgclean.xsl
+	@XSLTPROC@ 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 ' ' ',') \
+                 --strip-xml-prolog \
+                 $< > $@
 
 # Use FontForge to convert the sfd source files to woff2.
 .sfd.woff2:
-	@FONTFORGE@ -script sfd2woff $<
+	@FONTFORGE@ -script sfd2woff.ff $<
 
 # Base64-encode a woff2 (web open font format 2.0) file. We use this
 # to embed fonts directly into the CSS that requires them.
 .woff2.base64:
 	@BASE64@ -w0 $< > $@
 
+# Same with the favicon SVG.
+.svg.base64:
+	@BASE64@ -w0 $< > $@
+
 # Build index.html by substituting the contents of a few (single
 # line!) files into @PLACEHOLDERS@ within index.html.in. If you put
 # tildes in tableau.svg this will probably break, so please don't do
 # that.
-index.html: index.html.in tableau.min.svg CharmBypass-Regular.base64 CharmBypass-Bold.base64
+index.html: index.html.in tableau.min.min.svg CharmBypass-Regular.base64 CharmBypass-Bold.base64 favicon.base64
+
 	sed -e "s~@CBPREGULAR@~$$(cat CharmBypass-Regular.base64)~" \
             -e "s~@CBPBOLD@~$$(cat CharmBypass-Bold.base64)~" \
-            -e "s~@SVGDATA@~$$(cat tableau.min.svg)~" \
+            -e "s~@FAVICON@~$$(cat favicon.base64)~" \
+            -e "s~@SVGDATA@~$$(cat tableau.min.min.svg)~" \
             $< > $@
 
 # If you really want to, we support installing index.html
@@ -60,4 +82,6 @@ dist_pkgdata_DATA = index.html
 CLEANFILES = $(dist_pkgdata_DATA) \
              CharmBypass-Regular.base64 \
              CharmBypass-Bold.base64 \
-             tableau.min.svg
+             favicon.min.svg \
+             tableau.min.svg \
+             tableau.min.min.svg