presentations/WR_Maciej_ITU_T2012: use common figures

presentations/WR_Maciej_ITU-T2012/Makefile

@@ -2,16 +2,14 @@ all : WhiteRabbit.pdf
 
 .PHONY : all clean
 
-WhiteRabbit.pdf : WhiteRabbit.tex figs
+WhiteRabbit.pdf : WhiteRabbit.tex
 	latex $^
 	latex $^
 	dvips WhiteRabbit
 
 	ps2pdf WhiteRabbit.ps
-figs:
-	$(MAKE) -C fig
 
 clean :
 #	$(MAKE) clean -C fig 
-	rm -f *.eps *.pdf *.dat *.log *.out *.aux *.dvi *.ps
+	rm -f *.eps *.pdf *.dat *.log *.out *.aux *.dvi *.ps *.nav *.snm *.toc
 

presentations/WR_Maciej_ITU-T2012/WhiteRabbit.tex

@@ -155,7 +155,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
   \end{itemize}
 
   \begin{center}
-  \includegraphics[height=3cm]{fig/wrLink.ps}
+  \includegraphics[height=3cm]{../../figures/protocol/wrLink.ps}
   \end{center}
 
 \end{frame}
@@ -192,7 +192,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{Fine Delay Measurement}
 
   \begin{center}
-  \includegraphics[width=10.0cm]{fig/link_model.eps}
+  \includegraphics[width=10.0cm]{../../figures/protocol/link_model.eps}
   \end{center}
 
 \end{frame}
@@ -203,7 +203,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{Link Asymmetry}
 
   \begin{center}
-  \includegraphics[height=4cm]{fig/wrLinkModel_init.eps}
+  \includegraphics[height=4cm]{../../figures/protocol/wrLinkModel_init.eps}
   \end{center}
 
 \end{frame}
@@ -222,7 +222,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
    \vspace{0.2cm}
 
   \begin{center}
-  \includegraphics[height=2.5cm]{fig/delaymodel.eps}
+  \includegraphics[height=2.5cm]{../../figures/protocol/delaymodel.eps}
   \end{center}
 
 \begin{columns}[c]
@@ -250,7 +250,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{Fixed Delays}
 
   \begin{center}
-  \includegraphics[width=11.0cm]{fig/asymmetries.eps}
+  \includegraphics[width=11.0cm]{../../figures/protocol/asymmetries.eps}
   \end{center}
 
 \end{frame}
@@ -261,7 +261,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{Link Delay Model: fiber optic solution}
 
   \begin{center}
-  \includegraphics[height=4cm]{fig/wrLinkModel.eps}
+  \includegraphics[height=4cm]{../../figures/protocol/wrLinkModel.eps}
   \end{center}
 
   \begin{columns}[c]
@@ -320,7 +320,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
   \column{.5\textwidth} 
 
     \begin{center}
-    \includegraphics[width=5.0cm]{fig/WR-peer_recognision-1.eps}
+    \includegraphics[width=5.0cm]{../../figures/protocol/WR-peer_recognision-1.eps}
     \newline
     Two WR devices
     \end{center}
@@ -328,7 +328,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
   \column{.5\textwidth}
 
     \begin{center}
-    \includegraphics[width=5.0cm]{fig/WR-peer_recognision-2.eps}
+    \includegraphics[width=5.0cm]{../../figures/protocol/WR-peer_recognision-2.eps}
     \newline
     WR and non-WR device
     \end{center}
@@ -345,7 +345,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
   \column{.5\textwidth} 
 
       \begin{center}
-      \includegraphics[width=5.5cm]{fig/wrLinkSetup.eps}
+      \includegraphics[width=5.5cm]{../../figures/protocol/wrLinkSetup.eps}
       \end{center}
 
 
@@ -369,7 +369,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{Modified Best Master Clock Algorithm (mBMCA)}
 
     \begin{center}
-    \includegraphics[height=7.0cm]{fig/mBMCvsBMC.eps}
+    \includegraphics[height=7.0cm]{../../figures/protocol/mBMCvsBMC.eps}
     \end{center}
 
 
@@ -383,7 +383,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 %{\it [problem with a presentation flow]}
 
   \begin{center}
-  \includegraphics[width=11.8cm]{fig/wrCRS+mBMC.eps}
+  \includegraphics[width=11.8cm]{../../figures/protocol/wrCRS_plus_mBMC.eps}
   \end{center}
 
 \end{frame}
@@ -394,7 +394,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{Test bed}
 
     \begin{center}
-    \includegraphics[height=7.0cm]{fig/measSystem.ps}
+    \includegraphics[height=7.0cm]{../../figures/measurements/measSystem.ps}
     \end{center}
 
 \end{frame}
@@ -404,7 +404,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{Test results}
 
     \begin{center}
-    \includegraphics[height=6.0cm]{fig/measResults-new.eps}
+    \includegraphics[height=6.0cm]{../../figures/measurements/measResults-new.eps}
     \end{center}
 
 
@@ -415,7 +415,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{White Rabbit Switch (V3)}
 
     \begin{center}
-    \includegraphics[width=6.0cm]{fig/wrSwitchV3.ps}
+    \includegraphics[width=6.0cm]{../../figures/switch/wrSwitchV3.ps}
     \end{center}
 
 	\begin{itemize}
@@ -471,7 +471,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
     
     \begin{center}
 %    \includegraphics[height=4.0cm]{fig/white_rabbit_by_kyoht.ps}
-    \includegraphics[height=4.0cm]{fig/WRlogo.ps}
+    \includegraphics[height=4.0cm]{../../figures/logo/WRlogo.ps}
     \end{center}
 
 \end{frame}
@@ -484,7 +484,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{Fixed Delays Measurement}
 
   \begin{center}
-  \includegraphics[width=10.0cm]{fig/calibration.eps}
+  \includegraphics[width=10.0cm]{../../figures/misc/calibration.eps}
   \end{center}
 
 \end{frame}
@@ -494,7 +494,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{Proposed topology of WR network at CERN}
 
     \begin{center}
-    \includegraphics[width=8cm]{fig/NT-overview.eps}
+    \includegraphics[width=8cm]{../../figures/applications/CERN/NT-overview.eps}
     \end{center}
 
 \end{frame}
@@ -504,7 +504,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
 \begin{frame}{WR-compliant Hardware Kit}
 
     \begin{center}
-    \includegraphics[width=6cm]{fig/shw_kit}
+    \includegraphics[width=6cm]{../../figures/node/shw_kit}
     \end{center}
 
   \begin{columns}[c]