From c50ff6386187072bf995eeec591efd263442fd49 Mon Sep 17 00:00:00 2001 From: mkr Date: Mon, 29 May 2006 08:50:20 +0000 Subject: [PATCH] Update build and install processes for GUI and TUI documentation. --- doc/salome/Makefile.in | 26 ++++++++++++++++---------- doc/salome/gui/Makefile.in | 4 ++-- doc/salome/tui/Makefile.in | 4 +--- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in index 95b9b1ed2..0c172d6fc 100644 --- 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 48512c760..8ad0681cd 100644 --- 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 536da09ef..113fe7d8a 100644 --- 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 -- 2.39.2