Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Documentation
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Documentation	(revision 81)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Documentation	(revision 88)
@@ -1,10 +1,11 @@
-#-----[ Directory ]----------------------------------------
+#-----[ Directory ]----------------------------------------
 
-DIR_DOCUMENTATION       = .
-DIR_TEX   	        = $(DIR_DOCUMENTATION)
-DIR_SCHEMA              = $(DIR_DOCUMENTATION)/fig
-DIR_SCHEMA_EPS          = $(DIR_DOCUMENTATION)/eps
+DIR_DOC                 = .
+DIR_TEX                 = $(DIR_DOC)
+DIR_FIG                 = $(DIR_DOC)/fig
+DIR_EPS                 = $(DIR_DOC)/eps
+DIR_STY                 = $(DIR_DOC)/sty
 
-#-----[ Files ]--------------------------------------------
+#-----[ Files ]--------------------------------------------
 
 TEX_FILES               = $(wildcard $(DIR_TEX)/*.tex)
@@ -12,16 +13,17 @@
 PS_FILES                = $(patsubst $(DIR_TEX)/%.tex,%.ps ,$(TEX_FILES))
 PDF_FILES               = $(patsubst $(DIR_TEX)/%.tex,%.pdf,$(TEX_FILES))
-EPS_FILES               = $(patsubst $(DIR_SCHEMA)/%.fig,$(DIR_SCHEMA_EPS)/%.eps,$(wildcard $(DIR_SCHEMA)/*.fig))       \
-                          $(patsubst $(DIR_SCHEMA)/%.eps,$(DIR_SCHEMA_EPS)/%.eps,$(wildcard $(DIR_SCHEMA)/*.eps))
+EPS_FILES               = $(patsubst $(DIR_FIG)/%.fig,$(DIR_EPS)/%.eps,$(wildcard $(DIR_FIG)/*.fig))       \
+                          $(patsubst $(DIR_FIG)/%.dot,$(DIR_EPS)/%.eps,$(wildcard $(DIR_FIG)/*.dot))       \
+                          $(patsubst $(DIR_FIG)/%.eps,$(DIR_EPS)/%.eps,$(wildcard $(DIR_FIG)/*.eps))
 
-#-----[ Rules ]--------------------------------------------
+#-----[ Rules ]--------------------------------------------
 
 #--------------------------------------------------------------------------------
 # The reset of this file shall not be editted
 #--------------------------------------------------------------------------------
-.PHONY 			: all clean help
-.SECONDARY 		: $(DVI_FILES) $(PS_FILES) $(PDF_FILES) $(EPS_FILES) $(DIR_SCHEMA_EPS)
+.PHONY                  : all clean clean_all help
+.SECONDARY              : $(DVI_FILES) $(PS_FILES) $(PDF_FILES) $(EPS_FILES) $(DIR_EPS)
 
-all_documentation	: $(EPS_FILES)
+all_documentation       : $(EPS_FILES)
 			$(MAKE) $(PDF_FILES)
 
@@ -30,24 +32,24 @@
 # regular flow tex -> dvi -> ps -> pdf.
 #--------------------------------------------------------------------------------
-%.pdf 			: %.ps
+%.pdf                   : %.ps
 			@\
-			$(ECHO) "Génération du fichier $*.pdf"; 	\
+			$(ECHO) "Génération du fichier $*.pdf";         \
 			$(PS2PDF) $< $@;
 
-%.ps 			: %.dvi
+%.ps                    : %.dvi
 			@\
-			$(ECHO) "Génération du fichier $*.ps";		\
+			$(ECHO) "Génération du fichier $*.ps";          \
 			$(DVIPS) -o $@ $<;
 
-%.dvi 			: $(DIR_TEX)/%.tex
+%.dvi                   : $(DIR_TEX)/%.tex
 			@\
-			$(ECHO) "Génération du fichier $*.dvi";		\
-			$(LATEX) $<;					\
-			$(LATEX) $< > /dev/null;			\
-			citation=`$(GREP) "citation" $*.aux`; 		\
-	                if $(TEST) -n "$$citation" ; then  		\
-				$(BIBTEX) $* ; 				\
-			fi;						\
-			$(LATEX) $< > /dev/null;			\
+			$(ECHO) "Génération du fichier $*.dvi";         \
+			$(LATEX) $<;                                    \
+			$(LATEX) $< > /dev/null;                        \
+			citation=`$(GREP) "citation" $*.aux`;           \
+			if $(TEST) -n "$$citation" ; then               \
+			        $(BIBTEX) $* ;                          \
+			fi;                                             \
+			$(LATEX) $< > /dev/null;                        \
 			$(LATEX) $< > /dev/null;
 
@@ -55,18 +57,25 @@
 # The figures directory
 #--------------------------------------------------------------------------------
-$(DIR_SCHEMA_EPS)	:
+$(DIR_EPS)      :
 			@\
-			$(ECHO) "Make directory       : $@";		\
+			$(ECHO) "Make directory       : $@";            \
 			$(MKDIR) $@;
 
-$(DIR_SCHEMA_EPS)/%.eps	: $(DIR_SCHEMA)/%.eps $(DIR_SCHEMA_EPS)
+$(DIR_EPS)/%.eps        : $(DIR_FIG)/%.eps $(DIR_EPS)
 			@\
-			$(ECHO) "Generate   files     : $*.eps";	\
-			$(CP) $(DIR_SCHEMA)/$*.eps $(DIR_SCHEMA_EPS);
+			$(ECHO) "Generate   files     : $*.eps";        \
+			$(CP) $(DIR_FIG)/$*.eps $(DIR_EPS);
 
-$(DIR_SCHEMA_EPS)/%.eps	: $(DIR_SCHEMA)/%.fig $(DIR_SCHEMA_EPS)
+$(DIR_EPS)/%.eps        : $(DIR_FIG)/%.fig $(DIR_EPS)
 			@\
-			$(ECHO) "Generate   files     : $*.eps";	\
+			$(ECHO) "Generate   files     : $*.eps";        \
 			$(FIG2EPS) $< $@;
+
+$(DIR_EPS)/%.eps        : $(DIR_FIG)/%.dot $(DIR_EPS)
+			@\
+			$(ECHO) "Generate   files     : $*.eps";        \
+			$(DOT) -Tfig -o $(DIR_EPS)/${*}.fig $<; \
+			$(FIG2EPS) $(DIR_EPS)/${*}.fig $@;      \
+			$(RM) $(DIR_EPS)/${*}.fig;
 
 #--------------------------------------------------------------------------------
@@ -74,37 +83,33 @@
 #--------------------------------------------------------------------------------
 
-clean			:
+clean                   :
 			@\
 			$(ECHO) "Delete     temporary files              "$(PWD); \
-			$(RM) $(DIR_SCHEMA_EPS);			\
-			$(RM) $(DVI_FILES) $(PS_FILES) $(PDF_FILES);	\
-			$(MAKE) clean_rec DIR_CLEAN=.;
+			$(RM) $(DIR_EPS)                      \
+			      $(DVI_FILES)                    \
+			      $(PS_FILES)                     \
+			      $(DIR_DOC)/*~                   \
+			      $(DIR_STY)/*~                   \
+			      $(DIR_TEX)/*~                   \
+			      $(DIR_FIG)/*~                   \
+			      $(DIR_DOC)/*.bak                \
+			      $(DIR_DOC)/*.aux                \
+			      $(DIR_DOC)/*.bbl                \
+			      $(DIR_DOC)/*.blg                \
+			      $(DIR_DOC)/*.bmt                \
+			      $(DIR_DOC)/*.log                \
+			      $(DIR_DOC)/*.mtc*               \
+			      $(DIR_DOC)/*.toc                \
+			      $(DIR_DOC)/*.idx                \
+			      $(DIR_DOC)/*.maf                \
+			      $(DIR_DOC)/*.ilg                \
+			      $(DIR_DOC)/*.ind                \
+			      $(DIR_DOC)/*.out                \
+			      $(DIR_DOC)/*.nav                \
+			      $(DIR_DOC)/*.snm                \
+			      $(DIR_DOC)/missfont.log;        \
 
-#Clean recursive
-clean_rec		:
-			@\
-			$(ECHO) "Delete     temporary files in directory $(DIR_CLEAN)"; \
-			$(RM)	$(DIR_CLEAN)/*~ 		\
-				$(DIR_CLEAN)/*.bak  		\
-				$(DIR_CLEAN)/*.aux  		\
-				$(DIR_CLEAN)/*.bbl  		\
-				$(DIR_CLEAN)/*.blg  		\
-				$(DIR_CLEAN)/*.bmt  		\
-				$(DIR_CLEAN)/*.log  		\
-				$(DIR_CLEAN)/*.mtc* 		\
-				$(DIR_CLEAN)/*.toc  		\
-				$(DIR_CLEAN)/*.idx  		\
-				$(DIR_CLEAN)/*.ilg  		\
-				$(DIR_CLEAN)/*.ind  		\
-				$(DIR_CLEAN)/*.out  		\
-				$(DIR_CLEAN)/*.nav  		\
-				$(DIR_CLEAN)/*.snm  		\
-				$(DIR_CLEAN)/missfont.log;	\
-			for files in `$(LS) $(DIR_CLEAN)`; do                              			\
-				if $(TEST) -d $(DIR_CLEAN)/$$files;                         			\
-				then                                                        			\
-					$(MAKE) clean_rec DIR_CLEAN=$(DIR_CLEAN)/$$files;   			\
-				fi;                                                         			\
-			done;
+clean_all               : clean
+			@$(RM) $(PDF_FILES);
 
 #--------------------------------------------------------------------------------
@@ -112,10 +117,11 @@
 #--------------------------------------------------------------------------------
 
-help			:
+help                    :
 			@\
-			$(ECHO) " -----[ Documentation ]------------------------------";\
-			$(ECHO) "";							\
-			$(ECHO) " * all_documentation    : Generate all documents";	\
-			$(ECHO) " * clean                : Erase all generate files";	\
-			$(ECHO) " * help                 : Print this message";		\
+			$(ECHO) " -----[ Documentation ]------------------------------";\
+			$(ECHO) "";                                                     \
+			$(ECHO) " * all_documentation    : Generate all documents";     \
+			$(ECHO) " * clean                : Erase all temporary files";  \
+			$(ECHO) " * clean_all            : Erase all generate files";   \
+			$(ECHO) " * help                 : Print this message";         \
 			$(ECHO) "";
