Update build and install processes for GUI and TUI documentation.

diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in
index 2429812a09b16013db81eaf5ca4a208e4488e874..46b870ff5831e18e425f9df62c8d5f79eeda43ca 100644 (file)
--- a/doc/salome/Makefile.in
+++ b/doc/salome/Makefile.in
@@ -18,16 +18,13 @@ SUBDIRSTUI= tui
 
 @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;    \
@@ -35,20 +32,29 @@ dev_docs:
 
 clean:
        @@SETX@; for d in $(SUBDIRS); do        \
-          (cd $$d && $(MAKE) $@) || exit 1;    \
+          if test -d $$d/GEOM; 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/GEOM; 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/GEOM; then            \
+             (cd $$d && $(MAKE) $@);           \
+          fi;                                  \
+       done
 
 uninstall:
        @@SETX@; for d in $(SUBDIRS); do        \
-          (cd $$d && $(MAKE) $@) || exit 1;    \
+          if test -d $$d/GEOM; then            \
+             (cd $$d && $(MAKE) $@) || exit 1; \
+          fi;                                  \
        done; \

diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.in
index 1b73ad808410f7569175e2c14877a606fe501940..e3b972a37d80ddb68f981e1377ef84aff16ec504 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)/GEOM ./
        -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 ce10c939eb1cc08d6f8f37b4d52609b6b6d502c6..1667ca7675625fdbbd81c57f1af8c052082c03b7 100644 (file)
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -22,7 +22,7 @@ PYTHON_SCRIPTS = \
 
 #PYTHON_SCRIPTS_PY2 = py2/geompy.py py2/GEOM_TestMeasures.py
 
-docs:
+dev_docs:
        cp -fr $(srcdir)/GEOM ./INPUT; \
        cp -fr ./GEOM/doxyfile ./GEOM/doxyfile_py ./INPUT; \
        cp -fr ./GEOM/sources/static/tree.js ./INPUT/sources/static; \
@@ -66,8 +66,6 @@ docs:
        cp -fr $(srcdir)/GEOM/HTML/ GEOM/
        rm -fr INPUT
 
-dev_docs: docs
-
 clean:
        rm -fr GEOM