Update build and install processes for GUI and TUI documentation.

diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in
index 7899adffc1cc46f2b6b075a6f3ad9c4ee21ac395..26554aa0d6b477d6f7d2e04867f02fa4e921649a 100644 (file)
--- a/doc/salome/Makefile.in
+++ b/doc/salome/Makefile.in
@@ -35,16 +35,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;    \
@@ -52,20 +49,29 @@ dev_docs:
 
 clean:
        @@SETX@; for d in $(SUBDIRS); do        \
-          (cd $$d && $(MAKE) $@) || exit 1;    \
+          if test -d $$d/VISU; 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/VISU; 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/VISU; then            \
+             (cd $$d && $(MAKE) $@);           \
+          fi;                                  \
+       done
 
 uninstall:
        @@SETX@; for d in $(SUBDIRS); do        \
-          (cd $$d && $(MAKE) $@) || exit 1;    \
+          if test -d $$d/VISU; then            \
+             (cd $$d && $(MAKE) $@) || exit 1; \
+          fi;                                  \
        done; \

diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.in
index 3f3617cc31479593c86c2bca319791a215258086..c8e9600c8410fbd1b3a6fe2856719a33200b7c8c 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)/VISU ./
        -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 59c95100569bff7511ba77aea5635a891798db6b..f44c28a05ef3550f1534470553d0e203b785b4f9 100644 (file)
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -16,7 +16,7 @@ doxygen=@DOXYGEN@
 
 @COMMENCE@
 
-docs:
+usr_docs:
        cp -fr $(srcdir)/VISU ./INPUT; \
        cp -fr ./VISU/doxyfile ./INPUT; \
        cp -fr ./VISU/sources/static/tree.js ./INPUT/sources/static; \
@@ -45,8 +45,6 @@ docs:
        cp -fr $(srcdir)/VISU/HTML/ VISU/
        rm -fr INPUT
 
-dev_docs: docs
-
 clean:
        rm -fr VISU