index.html.in: use "*" instead of "+" for input pattern validation

[charm-bypass.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d0e3f573dffc10d3266a3a87284db9a2b9977715..3e7137122ee10895ea5f435799ebba439adc9f98 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,16 +13,21 @@ PRECIOUS_IDS =  \
   tram          \
   trees         \
   treescopy     \
-  serviceletter \
+  serviceid     \
   servicename   \
   sky           \
   ticket        \
   ticketdate    \
   tickettime
 
-# Optimize our SVG, and remove its XML prologue so that it can be
-# included directly into the HTML document.
-tableau.min.svg: tableau.svg
+# 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 ' ' ',') \
                 --enable-id-stripping \
                 --enable-comment-stripping \
@@ -33,10 +38,6 @@ tableau.min.svg: tableau.svg
                 --error-on-flowtext \
                 $< > $@
 
-# Optimize our SVG **AGAIN**, ha ha!
-tableau.min.min.svg: tableau.min.svg
-       @XSLTPROC@ svgclean.xsl $< > $@
-
 # Use FontForge to convert the sfd source files to woff2.
 .sfd.woff2:
        @FONTFORGE@ -script sfd2woff.ff $<