wip other

[talk-2018-dc18-gdr.git] / Makefile

diff --git a/Makefile b/Makefile
index 02706eb13bd0201bdc30e74215a560bf727e12d4..af46a9270e452c13bbf94726e38f64ceade0f826 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,14 @@ SLIDES+= dm-2
 SLIDES+= dm-3
 SLIDES+= dm-5
 SLIDES+= dm-6
-SLIDES+= dm-3
+SLIDES+= dm-8
+SLIDES+= dm-6
+SLIDES+= dm-rebase-again # made from 7
+SLIDES+= dm-pre-wreck
 SLIDES+= dm-wreck # made from 4
-SLIDES+= dm-3
+SLIDES+= dm-post-wreck
+SLIDES+= dm-6
+# dm-for-zoom is made from 6
 #SLIDES+= manpage
 
 # layers
@@ -14,7 +19,11 @@ SLIDES+= dm-3
 #    X1    circles
 #    X2    edges
 #    X3    edges (53 is included in wreck)
+#    X4,5  upstream git history
 #   1X0-9  "master" note
+#   1X3    not included in pre-wreck
+#   151    included in rebase-again
+#    19    not in zoom
 # for
 #    X =
 #      1      [1]
@@ -35,19 +44,39 @@ all:        slides.pdf talk.ps
        # wtf!
        LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4  <$@.1 $o
 
+zoom.fig: dm-for-zoom.eps
+
 dm-%.ps: dm.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
        LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:$*9,1$*0:1$*9 <$@.1 $o
 
+dm-rebase-again.ps: dm.fig conflict.txt.eps
+       ./greyout <$< >$@.fig.tmp
+       iconv <$@.fig.tmp >$@.1 -f UTF-8 -t ISO-8859-1
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:79,151,170:179 <$@.1 $o
+
+dm-pre-wreck.ps: dm.fig conflict.txt.eps
+       iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:39,44:45,130:132,135:139 <$@.1 $o
+
+dm-post-wreck.ps: dm.fig conflict.txt.eps
+       iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+4,5,10:39,44:45,130:132,135:139 <$@.1 $o
+
 dm-wreck.ps: dm.fig conflict.txt.eps
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
-       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:3,53,+10:49,140:149 <$@.1 $o
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:3,5,44:45,53,+10:49,140:149 <$@.1 $o
 
 %.eps:   %.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
        # wtf!
        LC_CTYPE=en_GB fig2dev -L eps <$@.1 $o
 
+dm-for-zoom.eps: dm.fig
+       iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+       # wtf!
+       LC_CTYPE=en_GB fig2dev -L eps -D+10:18,20:69,160:168  <$@.1 $o
+
 manpage.ps: dgit.1-manpage Makefile
        man -Tps -l $< >$@.1
        pstops -pa3 '100:0@1.7(-4cm,-47cm)' <$@.1 >$@.2