]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
1) Add CMake files to the dist rules (make dist)
authorinv <inv@opencascade.com>
Tue, 9 Oct 2012 14:47:25 +0000 (14:47 +0000)
committerinv <inv@opencascade.com>
Tue, 9 Oct 2012 14:47:25 +0000 (14:47 +0000)
2) Fix problems of make dist (missing files)

35 files changed:
Makefile.am
adm_local/unix/make_common_starter.am
adm_local_without_kernel/unix/config_files/Makefile.am
configure.ac
doc/Makefile.am
doc/doxygen/Makefile.am
doc/salome/Makefile.am
idl/Makefile.am
src/INTERP_KERNEL/Makefile.am
src/MEDCalculator/Makefile.am
src/MEDCalculator/Swig/Makefile.am
src/MEDCalculator/Test/Makefile.am
src/MEDCoupling/Makefile.am
src/MEDCoupling/Test/Makefile.am
src/MEDCouplingCorba/Client/Makefile.am
src/MEDCouplingCorba/Makefile.am
src/MEDCouplingCorba/Test/Makefile.am
src/MEDCouplingCorba_Swig/Client/Makefile.am
src/MEDCouplingCorba_Swig/Makefile.am
src/MEDCoupling_Swig/Makefile.am
src/MEDLoader/Makefile.am
src/MEDLoader/Swig/Makefile.am
src/MEDLoader/Test/Makefile.am
src/MEDOP/Makefile.am
src/MEDOP/doc/Makefile.am [new file with mode: 0644]
src/MEDOP/doc/sphinx/Makefile.am
src/MEDOP/exe/Makefile.am
src/MEDOP/exe/appligen/Makefile.am
src/MEDOP/gui/Makefile.am
src/MEDOP/tui/Makefile.am
src/MedClient/Makefile.am
src/ParaMEDCouplingCorba/Makefile.am
src/ParaMEDMEM/Makefile.am
src/ParaMEDMEMTest/Makefile.am
src/ParaMEDMEM_Swig/Makefile.am

index 7d0ef27c6c6c1638eaacfc382fe718222c33a6ea..31fb714e6831233970a7ba30c033ce1fc21aa209 100644 (file)
@@ -24,8 +24,6 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 if MED_ENABLE_KERNEL
 if MED_ENABLE_GUI
   ACLOCAL_AMFLAGS = -I adm_local/unix/config_files                     \
index 6d704892baceb1760489003a3826aeb2e99cf1e3..17f56711fedab42ff00b2561233aeee78d1dcf8e 100644 (file)
@@ -30,6 +30,11 @@ else !MED_ENABLE_KERNEL
   AM_CPPFLAGS = -I$(top_builddir)/adm_local_without_kernel -include SALOMEconfig.h
 endif
 
+# ============================================================
+# Cmake files wildcard (to add then to the distribution)
+# ============================================================
+CMAKEFILES    = $(notdir $(wildcard $(srcdir)/CMakeLists.txt))
+
 # ============================================================
 # This file defines the common definitions used in several
 # Makefile. This file must be included, if needed, by the file
@@ -66,7 +71,7 @@ sharedpkgpythondir = $(salomepythondir)/shared_modules
 # Documentation directory
 docdir             = $(datadir)/doc/salome
 
-EXTRA_DIST =
+EXTRA_DIST         = $(CMAKEFILES)
 
 # tests
 tests: unittest
index eebcd3972914cca50420e8b4da200f9b702bc01f..86ed11388c61deb1e7918c5fd45e7512b1cfcb8d 100644 (file)
@@ -42,6 +42,7 @@ dist_admlocalwithoutkernelm4_DATA = \
     check_mpich.m4 \
     check_openmpi.m4 \
     check_swig.m4 \
+    check_sphinx.m4 \
     enable_pthreads.m4 \
     production.m4 \
     python.m4 \
index 842ab03bcb44af1d1cbd92708d1334501c2c4e68..c587c742a85fadf8fcdb5c79b6692c1e3ffdfe04 100644 (file)
@@ -764,6 +764,7 @@ AC_OUTPUT([ \
        src/MEDOP/exe/appligen/config_appli_model.xml \
        src/MEDOP/exe/appligen/appligen.sh \
        src/MEDOP/exe/image2med/Makefile \
+       src/MEDOP/doc/Makefile \
        src/MEDOP/doc/sphinx/conf.py \
        src/MEDOP/doc/sphinx/Makefile \
         doc/Makefile \
index 0b98f54f24ccf5fa93805ddb1d31aab510b469bb..d2117a6b1fe8690b695b297d55a2eb979b1a1b38 100644 (file)
@@ -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:
index 22c098a1f293281b02e335c10d1cc5c2520fc714..af129916444e6bf147e9b8ef1655e4df1edf7265 100644 (file)
@@ -69,4 +69,6 @@ EXTRA_DIST += figures \
              tools.dox \
              static/footer.html \
              static/doxygen.css \
-             images
+             images \
+             BuildPyExamplesFromCPP.py \
+             medcouplingexamples.doxy
index bd58106b1d57dc31f7417d1124cc9ca68cb30cef..6f578031caac87b99b50eec10a1b485a2bc482d3 100644 (file)
@@ -22,6 +22,9 @@
 # Date : 30/11/2001
 # $Header$
 #
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS    = tui
 SUBDIRSTUI = tui
 
index 06c8e5725dea4bfca8928d4a4b5ae2e93e52a3eb..0470067a128c1475ce56307bd2c961d6fb478aef 100644 (file)
@@ -24,8 +24,6 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 BASEIDL_FILES = \
        MED.idl MED_Gen.idl Compo1Py.idl \
        MEDCouplingCorbaServant.idl      \
index 89f58c9485147ba5f82c7e2b4b9a2996a87e76ec..25258d67c7aa8261cfc8e5184cbc6c95de4cef82 100644 (file)
@@ -24,8 +24,6 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 lib_LTLIBRARIES = libinterpkernel.la
 
 salomeinclude_HEADERS =                \
index ccd04d166c8544ff85f6a2d8a7ec6155cd8c558d..88ab814f63b558cbf1ef58a3ff0298e396a153f4 100644 (file)
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 MEDCALCULATOR_SUBDIRS =
 
 if !MED_ENABLE_MICROMED
index a935106c3fe27d79b8e30e3e579cc9162a7ac3a1..ee89dcb6fcd29162fb3b7187420ac6fd5c077f39 100644 (file)
@@ -22,8 +22,6 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 bin_PROGRAMS = spython
 
 lib_LTLIBRARIES = libmedcalculatorspython.la _MEDCalculator.la 
index 05159ce24383bc872fe6d9b0116390c138b6d7ae..51f038f2cdad48e94ec34ffd9b6fe0f463b82215 100644 (file)
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 bin_PROGRAMS= TestMEDCalculator
 
 TestMEDCalculator_CPPFLAGS=@CPPUNIT_INCLUDES@ @PTHREAD_CFLAGS@ $(PYTHON_INCLUDES) -I$(srcdir)/.. -I$(srcdir)/../Swig -I$(srcdir)/../../INTERP_KERNEL/Bases -I$(srcdir)/../../INTERP_KERNELTest -I$(srcdir)/../../INTERP_KERNEL -I$(srcdir)/../../INTERP_KERNEL/Geometric2D -I$(srcdir)/../../MEDCoupling -I$(srcdir)/../../MEDLoader
index 8f87532b8b6b448b917f1c534de1d050a1915ee0..77b16226db23de1f8970310624a252d913a95ffe 100644 (file)
@@ -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
index 4eff0b4a3af72b0db70f322e6ee236e90943434d..7edd4fe649b3fd96c6bf71d1c8f3adc1bfcbc85d 100755 (executable)
@@ -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
index 69c6295740daee2cc4cb1f65bdc2b14956f297fd..206ebba9ac0636bca0b769ca23a60851ef9315a4 100644 (file)
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 lib_LTLIBRARIES= libmedcouplingclient.la
 
 salomeinclude_HEADERS=                      \
index 4b0b2b3737f09ef2282bfb22a1e56a83a8d2ac35..845f200bb43fc5c6bd054279f14f8c684e853647 100644 (file)
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 if CPPUNIT_IS_OK
   SUBDIRS = . Client Test
 else
index a3d626e29e033b02a270044e565fcffc511de17a..b890e878f35a38829160b73b739c8c1b43f5bafc 100755 (executable)
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 bin_PROGRAMS= TestMEDCouplingCorbaServ TestMEDCouplingCorbaClt
 
 TestMEDCouplingCorbaServ_CPPFLAGS=$(CORBA_CXXFLAGS) $(CORBA_INCLUDES) @CPPUNIT_INCLUDES@ -I$(srcdir)/.. -I$(srcdir)/../../INTERP_KERNEL/Bases -I$(srcdir)/../../INTERP_KERNELTest -I$(srcdir)/../../INTERP_KERNEL \
index 68f06238cd219ff51fd1282dbb388ff3e2d5ca6a..1e7986d47ad8ded3d7fc69b5f32b215563606efc 100644 (file)
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 lib_LTLIBRARIES = _MEDCouplingClient.la
 
 salomeinclude_HEADERS = MEDCouplingClient.i
index 882fa344862904472f89315598a6e3d4d55ab207..9199ac5d4b171cb2727ef15c76dc116be2e52789 100644 (file)
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 SUBDIRS = Client
 
 lib_LTLIBRARIES = _MEDCouplingCorba.la
index 6f7acf9a24a2e65d51769c2267b54443c33e58b7..b5bc7a3b2daad49e7f66f8e8ace00da3faf2cf96 100644 (file)
@@ -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
index 31bdf0ffa2c6d8ca020cd68a2d09a71a7468e8dc..ccb326f69e4c403fbec89988835162a8319bb8b6 100755 (executable)
@@ -20,8 +20,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 MEDLOADER_SUBDIRS =
 
 if !MED_ENABLE_MICROMED
index bf514f6f6736191d611b8443a5dc4a40c70bdfa6..abe6b987afe74177fd9ee64c28e86204b32d0a48 100644 (file)
@@ -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
 
index c6d7be53477c648cc76aa506537b7a6f6e1b5717..f77c29e0f3b95f78b4e3a9f6fb967fd7c7cfdf55 100755 (executable)
@@ -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
index c41773e7e9c3a3073ff03ca082e30f924896f3ee..7665cbe88cfff7fe31301b397bd5c247413db281 100644 (file)
@@ -25,6 +25,8 @@
 # - exe: folder containing small executable programs for MED data processing
 # - doc: folder containing the documentation of the MEDOP package 
 
-SUBDIRS= cmp tui res gui exe doc/sphinx
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST = README.txt
+SUBDIRS= cmp tui res gui exe doc
+
+EXTRA_DIST += README.txt
diff --git a/src/MEDOP/doc/Makefile.am b/src/MEDOP/doc/Makefile.am
new file mode 100644 (file)
index 0000000..466e883
--- /dev/null
@@ -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
index 523111e66f0ba7f18fda89208a2a0f98580494de..9b30a4fa624dc9da6bf4a9c6f95962c8930bd837 100644 (file)
@@ -96,7 +96,9 @@ RSTFILES+=\
 EXTRA_DIST+= $(RSTFILES)
 
 EXTRA_DIST+= \
-       conf.py 
+       conf.py \
+       _static \
+       images
 
 install-data-local:
        $(INSTALL) -d $(DESTDIR)$(medopdocdir)
index 46d89fc8d7c0c960722a6aa358b802c06acfded3..e2d4e9dd8255a1f3087b9fe70604f64958fa4811 100644 (file)
@@ -17,4 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS=appligen image2med
index edb07c5d67ef416afefe3472426e88eb986b54cf..5cf4227c49246a752b1052efc319acc2a3b84133 100644 (file)
@@ -32,7 +32,7 @@ appligenbin_DATA= \
 appligenbin_SCRIPTS=\
        appligen.sh
 
-EXTRA_DIST += $(appligenbin_DATA) $(appligenbin_SCRIPTS)
+EXTRA_DIST += $(appligenbin_DATA) $(appligenbin_SCRIPTS) genenv.sh README.txt
 
 config_appli.xml: config_appli_model.xml
        cat $< | sed \
index 0c66199633c3d9fb3a55272ffb173fccafa013d4..60636afb86b2cb35c65f329f046cc26c951329e9 100644 (file)
@@ -37,7 +37,7 @@ SUBDIRS = dialogs
 %.qm: %.ts
        $(LRELEASE) $< -qm $@
 
-EXTRA_DIST+=$(MOC_FILES:%_moc.cxx=%.hxx) $(nodist_salomeres_DATA:%.qm=%.ts)
+EXTRA_DIST+=$(MOC_FILES:%_moc.cxx=%.hxx) $(nodist_salomeres_DATA:%.qm=%.ts) test
 
 mostlyclean-local:
        rm -f @builddir@/*_moc.cxx
index 6a82dd8f2c9a9654b74d2baedc702cf487b3e7d4..221ef3968e49ba54bfdea62180cf0d5fff073117 100644 (file)
@@ -20,4 +20,6 @@
 # This folder contains the packages for the Text User Interfaces:
 # - xmedpy: python library for TUI (python package installed with name xmed)
 
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS= xmedpy
index bab8a24acde7f2c6a27731e2ddc25c667048e5ec..3388c44cbfdb2a6ca560299378f5a071e9e7f992 100644 (file)
@@ -19,4 +19,7 @@
 
 #  MED MedClient : tool to transfer MED CORBA from server producer of MED object to a client using those MED object
 #
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = src test
index 2403d6a019358a38d0367527ec2b1a5d8ec59ac3..c666fd11406e0cfffd7146ae1104a93465ddb3ca 100644 (file)
@@ -19,8 +19,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 ###
 # MEDLoader and Test sub-folders are available only if MED3 is detected ok
 ### 
index 4f0910f185f6817c1a8c7096a6f46b84aec7a3da..077ff70028338d97880c8248cfc8e77895021c77 100644 (file)
@@ -19,8 +19,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 lib_LTLIBRARIES= libparamedmem.la
 
 salomeinclude_HEADERS= \
index 0bf55d2bf9ba8ff971b4ab6444c2bc5c70bf694d..ba023ecd7af9b604a9f8e538cd64a2cfc0a9af70 100644 (file)
@@ -19,8 +19,6 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 lib_LTLIBRARIES = libParaMEDMEMTest.la
 
 salomeinclude_HEADERS = \
index 59ed6b1d45c06a9d08ce1b08d9b005305581aeec..44fdf044aca1c2fcd63fd8b6c4aef37560fa2fd2 100644 (file)
@@ -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