From a3cdcaf7a9001392987cc34ad8b052e8753fb662 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 30 Dec 2010 03:33:18 +0000
Subject: [PATCH] Distinguish and ignore generated files

Change generated PNG and SVG filenames to be distinguishable from
static PNG and SVG.  Add all generated/copied files to .gitignore.
---
 .gitignore | 4 ++++
 Makefile   | 8 ++++----
 index.html | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0b84cec
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+s5-checksums.txt
+s5-blank
+*.dia.svg
+*.xcf.png
diff --git a/Makefile b/Makefile
index 09e0f40..a67cb66 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
-all: s5-checksums.txt dvswitch-simple.svg screenshot-1-annotated.png dvswitch-internal.svg
+all: s5-checksums.txt dvswitch-simple.dia.svg screenshot-1-annotated.xcf.png dvswitch-internal.dia.svg
 
 clean:
-	rm -r s5-checksums.txt s5-blank dvswitch-simple.svg screenshot-1-annotated.png dvswitch-internal.svg
+	rm -r s5-checksums.txt s5-blank *.dia.svg *.xcf.png
 
 s5-checksums.txt: /usr/share/s5/s5-blank
 	s5 blank .
 	sed -i 's/url(bodybg.gif)//' s5-blank/ui/default/pretty.css
 
-%.svg: %.dia
+%.dia.svg: %.dia
 	dia --export=$@ $<
 
-%.png: %.xcf
+%.xcf.png: %.xcf
 	gimp -i -d -b '							'\
 '(let* ((image (car (gimp-file-load RUN-NONINTERACTIVE "$<" "$<")))	'\
 '       (layer (car (gimp-image-flatten image))))			'\
diff --git a/index.html b/index.html
index dec5f13..063ac2a 100644
--- a/index.html
+++ b/index.html
@@ -183,7 +183,7 @@
   <p>
     A simplified view of the typical components:
   </p>
-  <object data="dvswitch-simple.svg" width="60%" height="60%"></object>
+  <object data="dvswitch-simple.dia.svg" width="60%" height="60%"></object>
 </div>
 
 <div class="slide">
@@ -259,12 +259,12 @@
 
 <div class="slide">
   <h1>Mixer UI, annotated</h1>
-  <object data="screenshot-1-annotated.png" width="50%"></object>
+  <object data="screenshot-1-annotated.xcf.png" width="50%"></object>
 </div>
 
 <div class="slide">
   <h1>Mixer internals</h1>
-  <object data="dvswitch-internal.svg" width="90%" height="90%"></object>
+  <object data="dvswitch-internal.dia.svg" width="90%" height="90%"></object>
   <div class="handout">
     <p>
       To simplify the diagram, I omitted connection setup, tally light
-- 
2.39.5