Add git url for slides to last page

[obnox/slides/2016-04-vault.git] / Makefile

diff --git a/Makefile b/Makefile
index 4c99b8d75018daa12ac792beba33df6c694f52ce..c777c721ce9f6c4f79c55add10f5e2c05800f9db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,31 +6,47 @@ TARGET_HO2 = $(TARGET_BASE_NAME).ho2
 
 TARGET = $(TARGET_BASE_NAME)
 
-# IMAGE_MC_V1 = smb3-mc-samba
-# IMAGE_MC_V2 = smb3-mc-samba-v2
-# IMAGE_MC_DAEMONS_N1 = smb3-mc-daemons-n1
-# IMAGE_MC_DAEMONS_N1A = smb3-mc-daemons-n1a
-# IMAGE_MC_DAEMONS_N2 = smb3-mc-daemons-n2
-# IMAGE_MC_DAEMONS_N3 = smb3-mc-daemons-n3
-# IMAGE_RDMA_V2 = smb3-rdma-samba-v2
+IMAGE_MC_V1 = smb3-mc-samba
+IMAGE_MC_V2 = smb3-mc-samba-v2
+IMAGE_MC_DAEMONS_N1 = smb3-mc-daemons-n1
+IMAGE_MC_DAEMONS_N1A = smb3-mc-daemons-n1a
+IMAGE_MC_DAEMONS_N2 = smb3-mc-daemons-n2
+IMAGE_MC_DAEMONS_N3 = smb3-mc-daemons-n3
+IMAGE_RDMA_V2 = smb3-rdma-samba-v2
 # IMAGE_CTDB_3N = design-ctdb-three-nodes
+IMAGE_CTDB_3N_WITNESS_STEP0 = design-ctdb-three-nodes-with-witness-step0
+IMAGE_CTDB_3N_WITNESS_STEP1 = design-ctdb-three-nodes-with-witness-step1
+IMAGE_CTDB_3N_WITNESS_STEP2A = design-ctdb-three-nodes-with-witness-step2a
+IMAGE_CTDB_3N_WITNESS_STEP2B = design-ctdb-three-nodes-with-witness-step2b
+IMAGE_CTDB_3N_WITNESS_STEP3A = design-ctdb-three-nodes-with-witness-step3a
+IMAGE_CTDB_3N_WITNESS_STEP3B = design-ctdb-three-nodes-with-witness-step3b
+IMAGE_CTDB_3N_WITNESS_STEP4 = design-ctdb-three-nodes-with-witness-step4
+IMAGE_CTDB_3N_WITNESS_STEP5 = design-ctdb-three-nodes-with-witness-step5
 # IMAGE_CTDB_DAEMONS = ctdb-design-daemons
 # IMAGE_SAMBA_LAYERS = samba-layers
 # IMAGE_SAMBA_RELEASES = samba-release-stream
 # 
-# DIAIMAGES_BASE := $(IMAGE_MC_V1) \
-#                $(IMAGE_MC_V2) \
-#                $(IMAGE_MC_DAEMONS_N1) \
-#                $(IMAGE_MC_DAEMONS_N1A) \
-#                $(IMAGE_MC_DAEMONS_N2) \
-#                $(IMAGE_MC_DAEMONS_N3) \
-#                $(IMAGE_RDMA_V2) \
+DIAIMAGES_BASE := $(IMAGE_MC_V1) \
+                 $(IMAGE_MC_V2) \
+                 $(IMAGE_MC_DAEMONS_N1) \
+                 $(IMAGE_MC_DAEMONS_N1A) \
+                 $(IMAGE_MC_DAEMONS_N2) \
+                 $(IMAGE_MC_DAEMONS_N3)\
+                 $(IMAGE_RDMA_V2) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP0) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP1) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP2A) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP2B) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP3A) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP3B) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP4) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP5)
 #                $(IMAGE_CTDB_3N) \
 #                $(IMAGE_CTDB_DAEMONS) \
 #                $(IMAGE_SAMBA_LAYERS) \
 #                $(IMAGE_SAMBA_RELEASES)
 
-DIAIMAGES_BASE :=
+#DIAIMAGES_BASE :=
 
 DIAIMAGES :=     $(foreach image, $(DIAIMAGES_BASE), $(image).dia)
 DIAIMAGES_PNG := $(foreach image, $(DIAIMAGES_BASE), $(image).png)
@@ -47,11 +63,25 @@ DIAIMAGES_FIG := $(foreach image, $(DIAIMAGES_BASE), $(image).fig)
 
 IMAGES = $(DIAIMAGES_PNG)
 
+
+EXTRA_WIKI_FILES = \
+                  intro-history.wiki \
+                  smb3.wiki \
+                  multichannel.wiki \
+                  smb-direct.wiki \
+                  witness.wiki \
+                  persistent.wiki \
+                  next.wiki \
+                  thanks.wiki
+
+
 CMN_DEPS = Makefile $(IMAGES)
 
 CMN_DEPS_WIKI = $(CMN_DEPS) document.part1.wiki document.part2.wiki document.part3.wiki content.wiki info.wiki
 
-CMN_DEPS_TEX = $(CMN_DEPS) beamercolorthemeobnoxsamba.sty beamerouterthemeobnoxinfolines.sty beamerthemeObnoxSamba.sty content.tex
+CMN_DEPS_TEX = $(CMN_DEPS) beamercolorthemeobnoxsamba.sty beamerouterthemeobnoxinfolines.sty beamerthemeObnoxSamba.sty
+
+CONTENT_DEPS_WIKI = $(CMN_DEPS) content.wiki $(EXTRA_WIKI_FILES)
 
 COMMON_DEPS = $(CMN_DEPS)
 
@@ -77,7 +107,7 @@ $(TARGET_PR).pdf: $(CMN_DEPS) pr.pdf
 
 pr.pdf: $(CMN_DEPS_TEX) pr.tex
 
-pr.tex: $(CMN_DEPS_WIKI) pr.wiki
+pr.tex: pr.wiki $(CONTENT_DEPS_WIKI)
 
 pr.wiki: $(CMN_DEPS_WIKI) pr.class.wiki
        cat document.part1.wiki pr.class.wiki document.part2.wiki info.wiki document.part3.wiki > $@
@@ -95,7 +125,7 @@ $(TARGET_HO).pdf: $(CMN_DEPS) ho.pdf
 
 ho.pdf: $(CMN_DEPS_TEX) ho.tex
 
-ho.tex: $(CMN_DEPS_WIKI) ho.wiki
+ho.tex: ho.wiki $(CONTENT_DEPS_WIKI)
 
 ho.wiki: $(CMN_DEPS_WIKI) ho.class.wiki
        cat document.part1.wiki ho.class.wiki document.part2.wiki info.wiki document.part3.wiki > $@
@@ -113,14 +143,12 @@ $(TARGET_HO2).pdf: $(CMN_DEPS) ho2.pdf
 
 ho2.pdf: $(CMN_DEPS_TEX) ho2.tex
 
-ho2.tex: $(CMN_DEPS_WIKI) ho2.wiki
+ho2.tex: ho2.wiki $(CONTENT_DEPS_WIKI)
 
 ho2.wiki: $(CMN_DEPS_WIKI) ho2.class.wiki
        cat document.part1.wiki ho2.class.wiki document.part2.wiki info.wiki document.part3.wiki > $@
 
 
-content.tex: content.wiki
-
 
 .wiki.tex:
        wiki2beamer $< > $@