Makefile.am,configure.ac,.gitignore: update for day.svg rename

Since we're moving the source day.svg to where the built day.svg
previously lived, a rename is also in order. We now name the optimized
output file day.min.svg.

diff --git a/.gitignore b/.gitignore
index dd9aa87edebae8b8a7195c388be089c2737731f9..6da536ac63acb29c5eed31c1d9bc3fbc5f36892a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ config.log
 config.status
 
 # Generated by make
-day.svg
+day.min.svg
 index.html
 CharmBypass-Regular.base64
 CharmBypass-Bold.base64

diff --git a/Makefile.am b/Makefile.am
index f295689d08dedf63b67e17a3a6483b7d2bc80741..04406bac8e41997bcdc126df8d5ffe0eee988157 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ PRECIOUS_IDS =  \
 
 # Optimize our SVG, and remove its XML prologue so that it can be
 # included directly into the HTML document.
-day.svg: src/day.svg
+day.min.svg: day.svg
        @SCOUR@ --protect-ids-list=$$(echo $(PRECIOUS_IDS) | tr ' ' ',') \
                 --enable-id-stripping \
                 --enable-comment-stripping \
@@ -38,12 +38,12 @@ day.svg: src/day.svg
 
 # Build index.html by substituting the contents of a few (single
 # line!) files into @PLACEHOLDERS@ within index.html.in. If you
-# put tildes in src/day.svg this will probably break, so please don't
+# put tildes in day.svg this will probably break, so please don't
 # do that.
-index.html: index.html.in day.svg CharmBypass-Regular.base64 CharmBypass-Bold.base64
+index.html: index.html.in day.min.svg CharmBypass-Regular.base64 CharmBypass-Bold.base64
        sed -e "s~@CBPREGULAR@~$$(cat CharmBypass-Regular.base64)~" \
             -e "s~@CBPBOLD@~$$(cat CharmBypass-Bold.base64)~" \
-            -e "s~@SVGDATA@~$$(cat day.svg)~" \
+            -e "s~@SVGDATA@~$$(cat day.min.svg)~" \
             $< > $@
 
 # If you really want to, we support installing index.html
@@ -52,4 +52,4 @@ dist_pkgdata_DATA = index.html
 
 # Automake doesn't understand our wacky build process so we have to
 # tell it which files are produced by running "make"
-CLEANFILES = $(dist_pkgdata_DATA) CharmBypass-Regular.base64 CharmBypass-Bold.base64 day.svg
+CLEANFILES = $(dist_pkgdata_DATA) CharmBypass-Regular.base64 CharmBypass-Bold.base64 day.min.svg

diff --git a/configure.ac b/configure.ac
index a1d9c82db8148d0873ed4a4406ccb561ce6567a3..b9b35c7d0c138a22f56a5fc3e3bd99f63efb8f8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([charm-bypass],[0.0.1],[michael@orlitzky.com])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz tar-ustar])
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_SRCDIR([src/day.svg])
+AC_CONFIG_SRCDIR([day.svg])
 
 AC_PATH_PROG(
   [BASE64],