Update build and install processes for GUI and TUI documentation.

diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in
index 95b9b1ed25629aa9743f165599f4e52a48fb7c98..0c172d6fceba7130db9fb78ce40a2e8c327f58f7 100644 (file)
--- a/doc/salome/Makefile.in
+++ b/doc/salome/Makefile.in
@@ -36,16 +36,13 @@ SUBDIRSGUI= gui
 
 @COMMENCE@
 
-docs:
-       @@SETX@; for d in $(SUBDIRS); do        \
-          (cd $$d && $(MAKE) $@) || exit 1;    \
-       done; \
-
 usr_docs:
        @@SETX@; for d in $(SUBDIRSGUI); do     \
           (cd $$d && $(MAKE) $@) || exit 1;    \
        done; \
 
+docs: usr_docs
+
 dev_docs:
        @@SETX@; for d in $(SUBDIRSTUI); do     \
           (cd $$d && $(MAKE) $@) || exit 1;    \
@@ -53,20 +50,29 @@ dev_docs:
 
 clean:
        @@SETX@; for d in $(SUBDIRS); do        \
-          (cd $$d && $(MAKE) $@) || exit 1;    \
+          if test -d $$d/SMESH; then           \
+             (cd $$d && $(MAKE) $@) || exit 1; \
+          fi;                                  \
        done
 
 distclean: clean
        @@SETX@; for d in $(SUBDIRS); do        \
-          (cd $$d && $(MAKE) $@) || exit 1;    \
+          if test -d $$d/SMESH; then           \
+             (cd $$d && $(MAKE) $@) || exit 1; \
+          fi;                                  \
        done
 
 install:
        $(MAKE) docs
-       (cd tui && $(MAKE) install);
-       (cd gui && $(MAKE) install);
+       @@SETX@; for d in $(SUBDIRS); do        \
+          if test -d $$d/SMESH; then           \
+             (cd $$d && $(MAKE) $@);           \
+          fi;                                  \
+       done
 
 uninstall:
        @@SETX@; for d in $(SUBDIRS); do        \
-          (cd $$d && $(MAKE) $@) || exit 1;    \
+          if test -d $$d/SMESH; then           \
+             (cd $$d && $(MAKE) $@) || exit 1; \
+          fi;                                  \
        done; \

diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.in
index 48512c760f601aeb34b4a978cf11959ed1f7b9fb..8ad0681cd5f43c54a16accd416eafefe021b3382 100644 (file)
--- a/doc/salome/gui/Makefile.in
+++ b/doc/salome/gui/Makefile.in
@@ -14,11 +14,11 @@ VPATH=.:@srcdir@
 
 @COMMENCE@
 
-docs:
+usr_docs:
        cp -fr $(srcdir)/SMESH ./
        -find $(PWD) -name CVS -prune -exec rm -rf {} \;
 
-usr_docs: docs
+docs: usr_docs
 
 clean:
        rm -fr `ls | grep -v "Makefile"`

diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in
index 536da09ef13ca7a2b03bf700c872953a527a658a..113fe7d8ab918eec5f11d41f32e117ae3e0a66eb 100644 (file)
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -19,7 +19,7 @@ doxygen=@DOXYGEN@
 PYTHON_SCRIPTS = \
        smesh.py
 
-docs:
+dev_docs:
        cp -fr $(srcdir)/SMESH ./INPUT; \
        cp -fr ./SMESH/doxyfile ./SMESH/doxyfile_py ./INPUT; \
        cp -fr ./SMESH/sources/static/tree.js ./INPUT/sources/static; \
@@ -63,8 +63,6 @@ docs:
        cp -fr $(srcdir)/SMESH/HTML/ SMESH/
        rm -fr INPUT
 
-dev_docs: docs
-
 clean:
        rm -fr SMESH