From c5dd0de0271b3c524560f9c0cd0309eb9e0a40f9 Mon Sep 17 00:00:00 2001
From: mkr <mkr@opencascade.com>
Date: Mon, 29 May 2006 08:22:54 +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 | 16 +++++++---------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in
index c9e589858..822e69867 100644
--- 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 171bbc231..defa5e322 100644
--- 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 3e0dbf6a5..5d2e4cec7 100644
--- 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
-- 
2.39.2