From: rnv <rnv@opencascade.com>
Date: Mon, 11 Apr 2011 06:49:03 +0000 (+0000)
Subject: RNV: porting documentation on the doxygen 1.7.3
X-Git-Tag: V6_3_0a1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=38d9d031ab9660b09c05a0bf76fd3efe0608f2bb;p=modules%2Fgeom.git

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 2bd8c5149..966cc8d12 100755
--- 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 959b86142..1ec1c9705 100755
--- 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 f74bafcd5..1baf2b714 100644
--- 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 971b9e8eb..fe6b4a917 100755
--- 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 \