From d654973496657433b66b5c378ee79e8131536c6e Mon Sep 17 00:00:00 2001 From: apo Date: Thu, 19 Apr 2007 08:13:33 +0000 Subject: [PATCH] Merge with BR_Dev_For_4_0 (initial version) --- doc/{Makefile.in => Makefile.am} | 38 +--------- doc/html/Makefile.in | 57 --------------- doc/salome/Makefile.am | 32 +++++++++ doc/salome/Makefile.in | 67 ------------------ .../tui/MED/sources/Application-About.png | Bin 19226 -> 19225 bytes doc/salome/tui/{Makefile.in => Makefile.am} | 29 ++------ src/MEDMEM/DataTest/Data/pointe.med | Bin 80011 -> 80010 bytes src/MedClient/test/resources/pointe.med | Bin 80011 -> 80010 bytes 8 files changed, 39 insertions(+), 184 deletions(-) rename doc/{Makefile.in => Makefile.am} (57%) delete mode 100644 doc/html/Makefile.in create mode 100644 doc/salome/Makefile.am delete mode 100644 doc/salome/Makefile.in rename doc/salome/tui/{Makefile.in => Makefile.am} (71%) diff --git a/doc/Makefile.in b/doc/Makefile.am similarity index 57% rename from doc/Makefile.in rename to doc/Makefile.am index c54fc262b..dcda7e9f9 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.am @@ -17,42 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# $Header$ -# -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - SUBDIRS= salome -@COMMENCE@ - -dev_docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done -clean: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -install: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done +EXTRA_DIST= MEDMEM html \ No newline at end of file diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in deleted file mode 100644 index 36943e852..000000000 --- a/doc/html/Makefile.in +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -* Makefile *- -# -# Author : Vasily Rusyaev (Open Cascade NN) -# Date : 13/02/2003 -# $Header: -# -# source path -top_srcdir=@top_srcdir@ -root_srcdir=@ROOT_SRCDIR@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ -doxygen=@DOXYGEN@ - -@COMMENCE@ - -doc: - cp -fr $(srcdir)/INPUT ./; \ - cd INPUT; \ - sed 's|../../../share/salome|$(root_srcdir)|' doxyfile > doxyfile1; \ - mv -f doxyfile1 doxyfile; \ - $(doxygen) ./doxyfile; \ - cd ..; \ - cp -fr $(srcdir)/INPUT/sources/static/*.* ./html/ - cp -fr $(srcdir)/INPUT/sources/ html/ - cp -fr $(srcdir)/INPUT/HTML/ html/ - -clean: - rm -rf html - -distclean: clean - rm -rf INPUT - -install: - $(INSTALL) -d $(docdir); \ - cp -rf html $(docdir) - -uninstall: - rm -rf $(docdir)/html diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am new file mode 100644 index 000000000..51028557b --- /dev/null +++ b/doc/salome/Makefile.am @@ -0,0 +1,32 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# -* Makefile *- +# +# Author : Patrick GOLDBRONN (CEA) +# Date : 30/11/2001 +# $Header$ +# + +SUBDIRS= tui + +dev_docs: + @@SETX@; for d in $(SUBDIRSTUI); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done; diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in deleted file mode 100644 index c88e71139..000000000 --- a/doc/salome/Makefile.in +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# $Header$ -# -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -SUBDIRS= tui - -@COMMENCE@ - -dev_docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done; \ - -clean: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/MED; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/MED; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -install: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/MED; then \ - (cd $$d && $(MAKE) $@); \ - fi; \ - done - -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/MED; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done; \ diff --git a/doc/salome/tui/MED/sources/Application-About.png b/doc/salome/tui/MED/sources/Application-About.png index 7b58330d50856e28562e8f9ed80dae72d6e6dda3..df0d5a187398c59271c45249950a92cd9cec68bb 100755 GIT binary patch delta 15 WcmbO=jdA8QMwZS1KlhESqTT>383gJ8 delta 16 XcmbO^jd9jAM%K;%KX=}ZETY~3Ffs)9 diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.am similarity index 71% rename from doc/salome/tui/Makefile.in rename to doc/salome/tui/Makefile.am index 8c85f6e65..7902dbe95 100644 --- a/doc/salome/tui/Makefile.in +++ b/doc/salome/tui/Makefile.am @@ -2,19 +2,10 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : Makefile.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Module : doc -# $Header: -top_srcdir=@top_srcdir@ -top_builddir=../../.. -root_srcdir=@ROOT_SRCDIR@ -srcdir=@srcdir@ -VPATH=.:@srcdir@ -doxygen=@DOXYGEN@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +EXTRA_DIST+= MED dev_docs: cp -fr $(srcdir)/MED ./INPUT; \ @@ -41,16 +32,8 @@ dev_docs: cp -fr $(srcdir)/MED/HTML/ MED/ rm -fr INPUT -clean: - rm -fr MED +doctuidir= $(docdir)/tui/MED +nodist_doctui_DATA= MED/doxyfile -distclean: clean - rm -fr INPUT - -install: - $(INSTALL) -d $(docdir); \ - mkdir -p $(docdir)/tui - cp -fr MED $(docdir)/tui - -uninstall: - rm -fr $(docdir)/tui/MED +doctuistaticdir= $(docdir)/tui/MED/sources/static +nodist_doctuistatic_DATA= MED/sources/static/tree.js diff --git a/src/MEDMEM/DataTest/Data/pointe.med b/src/MEDMEM/DataTest/Data/pointe.med index 430a74bd66aa41aa72035b1b3c284dbc81c04ec4..0dbc1e8fb67f318bad69c999cb95129bcf5f1408 100644 GIT binary patch delta 18 ZcmeDF$kO$Zg{9NO#jTNbD=TB01pq~n23`OF delta 19 acmeDB$kP3hg|*Ye#f`U-Wh)C~n*{($SO#hU diff --git a/src/MedClient/test/resources/pointe.med b/src/MedClient/test/resources/pointe.med index 430a74bd66aa41aa72035b1b3c284dbc81c04ec4..0dbc1e8fb67f318bad69c999cb95129bcf5f1408 100644 GIT binary patch delta 18 ZcmeDF$kO$Zg{9NO#jTNbD=TB01pq~n23`OF delta 19 acmeDB$kP3hg|*Ye#f`U-Wh)C~n*{($SO#hU -- 2.39.2