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.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
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 09e0f406f990d312e7153869efbf03d090c0c346..a67cb663ee2cd8c49836e7a35b803304b61ebe96 100644 (file)
--- 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:
 
 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
 
 
 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=$@ $<
 
        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))))                      '\
        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 dec5f13d9933b6c39eae07d89e70a50663a94ec9..063ac2a4c584f624ec46f4a8bc9ef7196d7679ce 100644 (file)
--- a/index.html
+++ b/index.html
@@ -183,7 +183,7 @@
   <p>
     A simplified view of the typical components:
   </p>
   <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">
 </div>
 
 <div class="slide">


@@ -259,12 +259,12 @@
 
 <div class="slide">
   <h1>Mixer UI, annotated</h1>
 
 <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>
 </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
   <div class="handout">
     <p>
       To simplify the diagram, I omitted connection setup, tally light