Update build and install processes for GUI and TUI documentation.

diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in
index c9e589858a025e3017d23eaafdbe30049f074b66..822e698675467b3d12668b2f65a754d3e5eea10f 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/GUI; 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/GUI; 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/GUI; then             \
+             (cd $$d && $(MAKE) $@);           \
+          fi;                                  \
+       done
 
 uninstall:
        @@SETX@; for d in $(SUBDIRS); do        \
-          (cd $$d && $(MAKE) $@) || exit 1;    \
+          if test -d $$d/GUI; then             \
+             (cd $$d && $(MAKE) $@) || exit 1; \
+          fi;                                  \
        done; \

diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.in
index 171bbc231dff5afe82b7cc32e5c6677a22f4623c..defa5e32272a25072fbe0f6627858c01b07d227c 100644 (file)
--- a/doc/salome/gui/Makefile.in
+++ b/doc/salome/gui/Makefile.in
@@ -14,7 +14,7 @@ VPATH=.:@srcdir@
 
 @COMMENCE@
 
-docs:
+usr_docs:
        cp -fr $(srcdir)/GUI ./
        -find $(PWD) -name CVS -prune -exec rm -rf {} \;
        ln -sf ${KERNEL_ROOT_DIR}/share/doc/salome/index.html ./GUI/kernel_index.html
@@ -22,7 +22,7 @@ docs:
        ln -sf ${KERNEL_ROOT_DIR}/share/doc/salome/UnitTests.html ./GUI/UnitTests.html
        ln -sf ${KERNEL_ROOT_DIR}/share/doc/salome/SALOME_Application.html ./GUI/SALOME_Application.html
 
-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 3e0dbf6a570bf2c5628a50b34d05454ff9deb2d0..5d2e4cec71e1a57334ef2b98d25ce934e6c194f2 100644 (file)
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -16,9 +16,9 @@ doxygen=@DOXYGEN@
 
 @COMMENCE@
 
-docs:
-       cp -fr $(srcdir)/SUIT ./INPUT; \
-       cp -f ./SUIT/doxyfile ./INPUT; \
+dev_docs:
+       cp -fr $(srcdir)/GUI ./INPUT; \
+       cp -f ./GUI/doxyfile ./INPUT; \
        cd INPUT; \
        sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \
        sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
@@ -40,13 +40,11 @@ docs:
        echo "Running doxygen in directory:"`pwd`; \
        $(doxygen) ./doxyfile; \
        cd ../; \
-       cp -fr $(srcdir)/SUIT/sources/ SUIT ; \
+       cp -fr $(srcdir)/GUI/sources/ GUI ; \
        rm -fr INPUT
 
-dev_docs: docs
-
 clean:
-       rm -fr SUIT
+       rm -fr GUI
 
 distclean: clean
        rm -fr INPUT
@@ -54,7 +52,7 @@ distclean: clean
 install:
        $(INSTALL) -d $(docdir); \
        mkdir -p $(docdir)/tui
-       cp -fr SUIT $(docdir)/tui
+       cp -fr GUI $(docdir)/tui
 
 uninstall:
-       rm -fr $(docdir)/tui/SUIT
+       rm -fr $(docdir)/tui/GUI