RNV: porting documentation on the doxygen 1.7.3

diff --git a/doc/salome/gui/GEOM/Makefile.am b/doc/salome/gui/GEOM/Makefile.am
index 2bd8c51492f1037a5f2ba1f837458a9560c01294..966cc8d12c91f2cd6d7945b27c930a8d570fa364 100755 (executable)
--- a/doc/salome/gui/GEOM/Makefile.am
+++ b/doc/salome/gui/GEOM/Makefile.am
@@ -71,8 +71,9 @@ install-data-local: usr_docs
            *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/GEOM ;;   \
          esac ;                                                                                \
        done ; \
+       cp -rp $(srcdir)/images/head.png $(DESTDIR)$(docdir)/gui/GEOM/geompy_doc ;              \
        fi
-       cp -rp $(srcdir)/images/head.png $(DESTDIR)$(docdir)/gui/GEOM/geompy_doc
+
 
 uninstall-local:
        rm -rf $(DESTDIR)$(docdir)/gui/GEOM

diff --git a/doc/salome/gui/GEOM/doxyfile.in b/doc/salome/gui/GEOM/doxyfile.in
index 959b861423dbdfb7f5cab6b623dd18238f64a34d..1ec1c970549c90f4c32b7dfb6ff3ea7fe9f8af22 100755 (executable)
--- a/doc/salome/gui/GEOM/doxyfile.in
+++ b/doc/salome/gui/GEOM/doxyfile.in
@@ -58,6 +58,11 @@ GENERATE_TREEVIEW = YES
 SEARCHENGINE     = YES
 TREEVIEW_WIDTH    = 300
 
+#---------------------------------------------------------------------------
+#SORT related options
+#---------------------------------------------------------------------------
+SORT_GROUP_NAMES = NO
+
 #---------------------------------------------------------------------------
 #LaTeX related option
 #---------------------------------------------------------------------------

diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index f74bafcd59680641e626ac523afa8bf503c50fe6..1baf2b714f4ebf230074a7a77e083a7a2612d28e 100644 (file)
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -34,12 +34,12 @@ dev_docs: doxyfile
        echo "===========================================" ;                    \
        sed -e "/class geompyDC/d" -e "s/^ *#/#/g" -e "s/^ *def /def /g"        \
          -e "s/geompyDC/geompy/g" $(top_srcdir)/src/GEOM_SWIG/geompyDC.py >    \
-         $(top_builddir)/src/GEOM_SWIG/geompy.py ;                             \
+         ./geompy.py                                      ;                    \
        echo "===========================================" ;                    \
        echo "Generating TUI documentation" ;                                   \
        echo "===========================================" ;                    \
        $(DOXYGEN) doxyfile ;                                                   \
-       rm -f $(top_builddir)/src/GEOM_SWIG/geompy.py
+       rm -f ./geompy.py
 
 clean-local:
        -rm -fr GEOM doxygen.bak

diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index 971b9e8ebcddb765d5e9fc25cbfa6b0b57ecd4c3..fe6b4a9174d4ceaf51b48514065f2cdee1879d04 100755 (executable)
--- a/doc/salome/tui/doxyfile.in
+++ b/doc/salome/tui/doxyfile.in
@@ -98,7 +98,7 @@ WARN_LOGFILE           =
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = @top_srcdir@/src \
-                        @top_builddir@/doc/salome/gui/GEOM/geompy.py \
+                        ./geompy.py \
                         @top_srcdir@/bin \
                         @top_srcdir@/idl \
                         @top_builddir@/bin \