1) Add CMake files to the dist rules (make dist)

2) Fix problems of make dist (missing files)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0b98f54f24ccf5fa93805ddb1d31aab510b469bb..d2117a6b1fe8690b695b297d55a2eb979b1a1b38 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = MEDMEM salome doxygen
 
 dev_docs:

diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 22c098a1f293281b02e335c10d1cc5c2520fc714..af129916444e6bf147e9b8ef1655e4df1edf7265 100644 (file)
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -69,4 +69,6 @@ EXTRA_DIST += figures \
              tools.dox \
              static/footer.html \
              static/doxygen.css \
-             images
+             images \
+             BuildPyExamplesFromCPP.py \
+             medcouplingexamples.doxy

diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
index bd58106b1d57dc31f7417d1124cc9ca68cb30cef..6f578031caac87b99b50eec10a1b485a2bc482d3 100644 (file)
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -22,6 +22,9 @@
 # Date : 30/11/2001
 # $Header$
 #
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS    = tui
 SUBDIRSTUI = tui
 

diff --git a/src/INTERP_KERNEL/Makefile.am b/src/INTERP_KERNEL/Makefile.am
index 89f58c9485147ba5f82c7e2b4b9a2996a87e76ec..25258d67c7aa8261cfc8e5184cbc6c95de4cef82 100644 (file)
--- a/src/INTERP_KERNEL/Makefile.am
+++ b/src/INTERP_KERNEL/Makefile.am
@@ -24,8 +24,6 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 lib_LTLIBRARIES = libinterpkernel.la
 
 salomeinclude_HEADERS =                \

diff --git a/src/MEDCoupling/Makefile.am b/src/MEDCoupling/Makefile.am
index 8f87532b8b6b448b917f1c534de1d050a1915ee0..77b16226db23de1f8970310624a252d913a95ffe 100644 (file)
--- a/src/MEDCoupling/Makefile.am
+++ b/src/MEDCoupling/Makefile.am
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 if CPPUNIT_IS_OK
   SUBDIRS = . Test
 endif

diff --git a/src/MEDCoupling/Test/Makefile.am b/src/MEDCoupling/Test/Makefile.am
index 4eff0b4a3af72b0db70f322e6ee236e90943434d..7edd4fe649b3fd96c6bf71d1c8f3adc1bfcbc85d 100755 (executable)
--- a/src/MEDCoupling/Test/Makefile.am
+++ b/src/MEDCoupling/Test/Makefile.am
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 bin_PROGRAMS= TestMEDCoupling TestMEDCouplingRemapper
 
 TestMEDCoupling_CPPFLAGS=@CPPUNIT_INCLUDES@ @PTHREAD_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../../INTERP_KERNEL/Bases -I$(srcdir)/../../INTERP_KERNELTest -I$(srcdir)/../../INTERP_KERNEL -I$(srcdir)/../../INTERP_KERNEL/Geometric2D
@@ -45,3 +43,5 @@ check : tests
 
 CLEANFILES = \
         UnitTestsResult
+
+EXTRA_DIST += MEDCouplingExamplesTest.cxx

diff --git a/src/MEDCoupling_Swig/Makefile.am b/src/MEDCoupling_Swig/Makefile.am
index 6f7acf9a24a2e65d51769c2267b54443c33e58b7..b5bc7a3b2daad49e7f66f8e8ace00da3faf2cf96 100644 (file)
--- a/src/MEDCoupling_Swig/Makefile.am
+++ b/src/MEDCoupling_Swig/Makefile.am
@@ -21,8 +21,6 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 lib_LTLIBRARIES = _MEDCoupling.la _MEDCouplingRemapper.la
 
 salomeinclude_HEADERS =  \
@@ -65,3 +63,5 @@ dist_salomescript_DATA= MEDCouplingBasicsTest.py MEDCouplingRemapperTest.py MEDC
 UNIT_TEST_PROG = MEDCouplingBasicsTest.py MEDCouplingRemapperTest.py
 
 #check : tests
+
+EXTRA_DIST += MEDCouplingExamplesTest.py

diff --git a/src/MEDLoader/Makefile.am b/src/MEDLoader/Makefile.am
index 31bdf0ffa2c6d8ca020cd68a2d09a71a7468e8dc..ccb326f69e4c403fbec89988835162a8319bb8b6 100755 (executable)
--- a/src/MEDLoader/Makefile.am
+++ b/src/MEDLoader/Makefile.am
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 MEDLOADER_SUBDIRS =
 
 if !MED_ENABLE_MICROMED

diff --git a/src/MEDLoader/Swig/Makefile.am b/src/MEDLoader/Swig/Makefile.am
index bf514f6f6736191d611b8443a5dc4a40c70bdfa6..abe6b987afe74177fd9ee64c28e86204b32d0a48 100644 (file)
--- a/src/MEDLoader/Swig/Makefile.am
+++ b/src/MEDLoader/Swig/Makefile.am
@@ -22,8 +22,7 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-EXTRA_DIST += SauvLoaderTest.py
+EXTRA_DIST += SauvLoaderTest.py MEDLoaderExamplesTest.py
 
 lib_LTLIBRARIES = _MEDLoader.la
 

diff --git a/src/MEDLoader/Test/Makefile.am b/src/MEDLoader/Test/Makefile.am
index c6d7be53477c648cc76aa506537b7a6f6e1b5717..f77c29e0f3b95f78b4e3a9f6fb967fd7c7cfdf55 100755 (executable)
--- a/src/MEDLoader/Test/Makefile.am
+++ b/src/MEDLoader/Test/Makefile.am
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 bin_PROGRAMS= TestMEDLoader TestSauvLoader
 
 TestMEDLoader_CPPFLAGS=@CPPUNIT_INCLUDES@ @PTHREAD_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../../INTERP_KERNEL/Bases -I$(srcdir)/../../INTERP_KERNELTest -I$(srcdir)/../../INTERP_KERNEL -I$(srcdir)/../../INTERP_KERNEL/Geometric2D -I$(srcdir)/../../MEDCoupling

diff --git a/src/MEDOP/doc/Makefile.am b/src/MEDOP/doc/Makefile.am
new file mode 100644 (file)
index 0000000..466e883
--- /dev/null
+++ b/src/MEDOP/doc/Makefile.am
@@ -0,0 +1,32 @@
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# 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
+#
+
+# This folder contains the packages for the MED fields operations:
+# - cmp: package containing the SALOME components
+# - tui: package containing the python user interface
+# - gui: package containing the graphical user interface (the GUI part of the MED module)
+# - res: folder containing data files (resources)
+# - exe: folder containing small executable programs for MED data processing
+# - doc: folder containing the documentation of the MEDOP package 
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+SUBDIRS= sphinx
+
+EXTRA_DIST += models

diff --git a/src/MEDOP/doc/sphinx/Makefile.am b/src/MEDOP/doc/sphinx/Makefile.am
index 523111e66f0ba7f18fda89208a2a0f98580494de..9b30a4fa624dc9da6bf4a9c6f95962c8930bd837 100644 (file)
--- a/src/MEDOP/doc/sphinx/Makefile.am
+++ b/src/MEDOP/doc/sphinx/Makefile.am
@@ -96,7 +96,9 @@ RSTFILES+=\
 EXTRA_DIST+= $(RSTFILES)
 
 EXTRA_DIST+= \
-       conf.py 
+       conf.py \
+       _static \
+       images
 
 install-data-local:
        $(INSTALL) -d $(DESTDIR)$(medopdocdir)

diff --git a/src/ParaMEDMEM/Makefile.am b/src/ParaMEDMEM/Makefile.am
index 4f0910f185f6817c1a8c7096a6f46b84aec7a3da..077ff70028338d97880c8248cfc8e77895021c77 100644 (file)
--- a/src/ParaMEDMEM/Makefile.am
+++ b/src/ParaMEDMEM/Makefile.am
@@ -19,8 +19,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 lib_LTLIBRARIES= libparamedmem.la
 
 salomeinclude_HEADERS= \

diff --git a/src/ParaMEDMEMTest/Makefile.am b/src/ParaMEDMEMTest/Makefile.am
index 0bf55d2bf9ba8ff971b4ab6444c2bc5c70bf694d..ba023ecd7af9b604a9f8e538cd64a2cfc0a9af70 100644 (file)
--- a/src/ParaMEDMEMTest/Makefile.am
+++ b/src/ParaMEDMEMTest/Makefile.am
@@ -19,8 +19,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 lib_LTLIBRARIES = libParaMEDMEMTest.la
 
 salomeinclude_HEADERS = \

diff --git a/src/ParaMEDMEM_Swig/Makefile.am b/src/ParaMEDMEM_Swig/Makefile.am
index 59ed6b1d45c06a9d08ce1b08d9b005305581aeec..44fdf044aca1c2fcd63fd8b6c4aef37560fa2fd2 100644 (file)
--- a/src/ParaMEDMEM_Swig/Makefile.am
+++ b/src/ParaMEDMEM_Swig/Makefile.am
@@ -21,8 +21,6 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 salomepython_PYTHON = ParaMEDMEM.py
 salomepyexec_LTLIBRARIES = _ParaMEDMEM.la