Fix problem with devdocs generation

diff --git a/Makefile.in b/Makefile.in
index 65dd62aa643d0fd5c0c80c549e6995f5d71e8844..7921a085d7dec8cd3fb821ae21814a61cc013eda 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,6 +137,14 @@ distclean-other:
        -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h 
        -$(RM) config.cache config.log config.status 
 
+usr_docs:
+       (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
+
+docs: usr_docs
+
+dev_docs:
+       (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
+
 @MODULE@
 
 install: install-bin install-include install-end

diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in
index 4a3992e1caf5b07890bfa45d47a2e0ba8c8dad5e..afffe5adba7148ce9cf69664b3bea03816f7353f 100644 (file)
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -28,33 +28,26 @@ top_builddir=../../..
 root_srcdir=@ROOT_SRCDIR@
 srcdir=@srcdir@
 VPATH=.:@srcdir@
-doxygen=@DOXYGEN@
 
 @COMMENCE@
 
 dev_docs:
        cp -fr $(srcdir)/SUPERV ./INPUT; \
        cp -fr ./SUPERV/doxyfile ./INPUT; \
-       cp -fr ./SUPERV/sources/static/tree.js ./INPUT/sources/static; \
        cd INPUT; \
-       sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \
-       sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
-       mv -f doxyfile2 doxyfile1; \
        echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \
        if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \
-         sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
-         $(doxygen) -u ./doxyfile1; \
+         sed 's|python_extension_must_be_here|*.py|' doxyfile > doxyfile1; \
        else \
-         sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
+         sed 's|python_extension_must_be_here||' doxyfile > doxyfile1; \
        fi; \
+       mv -f doxyfile1 doxyfile; \
        if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \
-         sed -e 's|BUILTIN_STL_SUPPORT    = NO|BUILTIN_STL_SUPPORT    = YES|' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
+         sed -e 's|BUILTIN_STL_SUPPORT    = NO|BUILTIN_STL_SUPPORT    = YES|' doxyfile > doxyfile1; \
+         mv -f doxyfile1 doxyfile; \
        fi; \
-       mv -f doxyfile1 doxyfile; \
-       $(doxygen) ./doxyfile; \
+       $(DOXYGEN) -u doxyfile; \
+       $(DOXYGEN) doxyfile; \
        cd ..; \
        cp -fr $(srcdir)/SUPERV/sources/static/*.* ./SUPERV/
        cp -fr $(srcdir)/SUPERV/sources/ SUPERV/
@@ -68,9 +61,12 @@ distclean: clean
        rm -fr INPUT
 
 install:
-       $(INSTALL) -d $(docdir); \
-       mkdir -p $(docdir)/tui
-       cp -fr SUPERV $(docdir)/tui
+       if test -d SUPERV; then \
+         $(INSTALL) -d $(docdir); \
+         mkdir -p $(docdir)/tui ; \
+         cp -fr SUPERV $(docdir)/tui ; \
+         find $(docdir)/tui -name CVS -prune -exec rm -rf {} ";" ; \
+       fi
 
 uninstall:
        rm -fr $(docdir)/tui/SUPERV

diff --git a/doc/salome/tui/SUPERV/doxyfile.in b/doc/salome/tui/SUPERV/doxyfile.in
index eea8362b1c1c25ead8d9885e88ee9114709777c5..56172baed3fdcf0b37cb3cd81011e71b0c1534e2 100755 (executable)
--- a/doc/salome/tui/SUPERV/doxyfile.in
+++ b/doc/salome/tui/SUPERV/doxyfile.in
@@ -36,8 +36,7 @@ ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = YES
 INLINE_INHERITED_MEMB  = YES
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = ../../../share/salome \
-                        ../../../build/salome
+STRIP_FROM_PATH        = @top_srcdir@ @top_builddir@
 STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
@@ -97,9 +96,9 @@ WARN_LOGFILE           = log.txt
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/src \
-                        ../../../share/salome/idl \
-                        ../../../build/salome/bin
+INPUT                  = @top_srcdir@/src \
+                        @top_srcdir@/idl \
+                        @top_builddir@/bin
 FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
 RECURSIVE              = YES
 EXCLUDE                =