From 9e65a16064019c111a876220559bc56d7f5da8af Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 9 Oct 2012 15:12:15 +0000 Subject: [PATCH] 1) Add CMake files to the dist rules (make dist) 2) Fix problems of make dist (missing files) --- doc/Makefile.am | 2 ++ doc/doxygen/Makefile.am | 4 +++- doc/salome/Makefile.am | 3 +++ src/INTERP_KERNEL/Makefile.am | 2 -- src/MEDCoupling/Makefile.am | 2 -- src/MEDCoupling/Test/Makefile.am | 4 ++-- src/MEDCoupling_Swig/Makefile.am | 4 ++-- src/MEDLoader/Makefile.am | 2 -- src/MEDLoader/Swig/Makefile.am | 3 +-- src/MEDLoader/Test/Makefile.am | 2 -- src/MEDOP/doc/Makefile.am | 32 ++++++++++++++++++++++++++++++++ src/MEDOP/doc/sphinx/Makefile.am | 4 +++- src/ParaMEDMEM/Makefile.am | 2 -- src/ParaMEDMEMTest/Makefile.am | 2 -- src/ParaMEDMEM_Swig/Makefile.am | 2 -- 15 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 src/MEDOP/doc/Makefile.am diff --git a/doc/Makefile.am b/doc/Makefile.am index 0b98f54f2..d2117a6b1 100644 --- 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 22c098a1f..af1299164 100644 --- 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 bd58106b1..6f578031c 100644 --- 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 89f58c948..25258d67c 100644 --- 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 8f87532b8..77b16226d 100644 --- 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 4eff0b4a3..7edd4fe64 100755 --- 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 6f7acf9a2..b5bc7a3b2 100644 --- 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 31bdf0ffa..ccb326f69 100755 --- 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 bf514f6f6..abe6b987a 100644 --- 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 c6d7be534..f77c29e0f 100755 --- 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 index 000000000..466e883f5 --- /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 523111e66..9b30a4fa6 100644 --- 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 4f0910f18..077ff7002 100644 --- 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 0bf55d2bf..ba023ecd7 100644 --- 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 59ed6b1d4..44fdf044a 100644 --- 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 -- 2.39.2