Cosmetics on the way the documentation of the tree of log channels is generated

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5268 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1102275..01ea695 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,7 +6,7 @@
 
 
 DOCSOURCES = $(shell find @top_srcdir@/tools/gras  @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") \
 
 
 DOCSOURCES = $(shell find @top_srcdir@/tools/gras  @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") \

- $(shell find @srcdir@ -name "*.doc")
+ $(shell find @srcdir@ -name "*.doc" |grep -v logcategories.doc)

 FIGS=simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig
 PNGS=$(patsubst %.fig,%.png,$(FIGS)) webcruft/simgrid_logo.png webcruft/simgrid_logo_small.png webcruft/poster_thumbnail.png
 
 FIGS=simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig
 PNGS=$(patsubst %.fig,%.png,$(FIGS)) webcruft/simgrid_logo.png webcruft/simgrid_logo_small.png webcruft/poster_thumbnail.png
 


@@ -69,11 +69,11 @@ publish:
 endif
 
 ./logcategories.doc: $(DOCSOURCES)
 endif
 
 ./logcategories.doc: $(DOCSOURCES)

-       pwd=`pwd`; rm $$pwd/logcategories.doc; set -e; \
+       pwd=`pwd`; rm -f $$pwd/logcategories.doc; set -e; \

        echo "/* Generated file, do not edit */"          > $$pwd/logcategories.doc; \
        echo "/** \addtogroup XBT_log_cats"              >> $$pwd/logcategories.doc; \
        echo "    @{"                                    >> $$pwd/logcategories.doc; \
        echo "/* Generated file, do not edit */"          > $$pwd/logcategories.doc; \
        echo "/** \addtogroup XBT_log_cats"              >> $$pwd/logcategories.doc; \
        echo "    @{"                                    >> $$pwd/logcategories.doc; \

-       cd @top_srcdir@/src; ./xbt_log_extract_hierarchy >> $$pwd/logcategories.doc; \
+       cd @top_srcdir@/src; ../tools/doxygen/xbt_log_extract_hierarchy.pl >> $$pwd/logcategories.doc; \

        echo "@}*/"                                      >> $$pwd/logcategories.doc;
 
 install-data-local: 
        echo "@}*/"                                      >> $$pwd/logcategories.doc;
 
 install-data-local: 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1a440b5..67a4735 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -202,7 +202,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 DOCSOURCES = $(shell find @top_srcdir@/tools/gras  @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") \
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 DOCSOURCES = $(shell find @top_srcdir@/tools/gras  @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") \

- $(shell find @srcdir@ -name "*.doc")
+ $(shell find @srcdir@ -name "*.doc" |grep -v logcategories.doc)

 
 FIGS = simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig
 PNGS = $(patsubst %.fig,%.png,$(FIGS)) webcruft/simgrid_logo.png webcruft/simgrid_logo_small.png webcruft/poster_thumbnail.png
 
 FIGS = simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig
 PNGS = $(patsubst %.fig,%.png,$(FIGS)) webcruft/simgrid_logo.png webcruft/simgrid_logo_small.png webcruft/poster_thumbnail.png


@@ -434,11 +434,11 @@ uninstall-am: uninstall-local
 @MAINTAINER_MODE_TRUE@ $(MAKE) -C .. sync-gforge
 
 ./logcategories.doc: $(DOCSOURCES)
 @MAINTAINER_MODE_TRUE@ $(MAKE) -C .. sync-gforge
 
 ./logcategories.doc: $(DOCSOURCES)

-       pwd=`pwd`; rm $$pwd/logcategories.doc; set -e; \
+       pwd=`pwd`; rm -f $$pwd/logcategories.doc; set -e; \

        echo "/* Generated file, do not edit */"          > $$pwd/logcategories.doc; \
        echo "/** \addtogroup XBT_log_cats"              >> $$pwd/logcategories.doc; \
        echo "    @{"                                    >> $$pwd/logcategories.doc; \
        echo "/* Generated file, do not edit */"          > $$pwd/logcategories.doc; \
        echo "/** \addtogroup XBT_log_cats"              >> $$pwd/logcategories.doc; \
        echo "    @{"                                    >> $$pwd/logcategories.doc; \

-       cd @top_srcdir@/src; ./xbt_log_extract_hierarchy >> $$pwd/logcategories.doc; \
+       cd @top_srcdir@/src; ../tools/doxygen/xbt_log_extract_hierarchy.pl >> $$pwd/logcategories.doc; \

        echo "@}*/"                                      >> $$pwd/logcategories.doc;
 
 install-data-local: 
        echo "@}*/"                                      >> $$pwd/logcategories.doc;
 
 install-data-local: 

diff --git a/src/xbt_log_extract_hierarchy b/tools/doxygen/xbt_log_extract_hierarchy.pl
similarity index 100%
rename from src/xbt_log_extract_hierarchy
rename to tools/doxygen/xbt_log_extract_hierarchy.pl