From d70780f2f288f48a301144ded1636d553a2f3779 Mon Sep 17 00:00:00 2001 From: inv Date: Tue, 9 Oct 2012 14:47:25 +0000 Subject: [PATCH] 1) Add CMake files to the dist rules (make dist) 2) Fix problems of make dist (missing files) --- Makefile.am | 2 -- adm_local/unix/make_common_starter.am | 7 +++- .../unix/config_files/Makefile.am | 1 + configure.ac | 1 + doc/Makefile.am | 2 ++ doc/doxygen/Makefile.am | 4 ++- doc/salome/Makefile.am | 3 ++ idl/Makefile.am | 2 -- src/INTERP_KERNEL/Makefile.am | 2 -- src/MEDCalculator/Makefile.am | 2 -- src/MEDCalculator/Swig/Makefile.am | 2 -- src/MEDCalculator/Test/Makefile.am | 2 -- src/MEDCoupling/Makefile.am | 2 -- src/MEDCoupling/Test/Makefile.am | 4 +-- src/MEDCouplingCorba/Client/Makefile.am | 2 -- src/MEDCouplingCorba/Makefile.am | 2 -- src/MEDCouplingCorba/Test/Makefile.am | 2 -- src/MEDCouplingCorba_Swig/Client/Makefile.am | 2 -- src/MEDCouplingCorba_Swig/Makefile.am | 2 -- 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/Makefile.am | 6 ++-- src/MEDOP/doc/Makefile.am | 32 +++++++++++++++++++ src/MEDOP/doc/sphinx/Makefile.am | 4 ++- src/MEDOP/exe/Makefile.am | 2 ++ src/MEDOP/exe/appligen/Makefile.am | 2 +- src/MEDOP/gui/Makefile.am | 2 +- src/MEDOP/tui/Makefile.am | 2 ++ src/MedClient/Makefile.am | 3 ++ src/ParaMEDCouplingCorba/Makefile.am | 2 -- src/ParaMEDMEM/Makefile.am | 2 -- src/ParaMEDMEMTest/Makefile.am | 2 -- src/ParaMEDMEM_Swig/Makefile.am | 2 -- 35 files changed, 69 insertions(+), 49 deletions(-) create mode 100644 src/MEDOP/doc/Makefile.am diff --git a/Makefile.am b/Makefile.am index 7d0ef27c6..31fb714e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 6d704892b..17f56711f 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -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 diff --git a/adm_local_without_kernel/unix/config_files/Makefile.am b/adm_local_without_kernel/unix/config_files/Makefile.am index eebcd3972..86ed11388 100644 --- a/adm_local_without_kernel/unix/config_files/Makefile.am +++ b/adm_local_without_kernel/unix/config_files/Makefile.am @@ -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 \ diff --git a/configure.ac b/configure.ac index 842ab03bc..c587c742a 100644 --- a/configure.ac +++ b/configure.ac @@ -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 \ 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/idl/Makefile.am b/idl/Makefile.am index 06c8e5725..0470067a1 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -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 \ 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/MEDCalculator/Makefile.am b/src/MEDCalculator/Makefile.am index ccd04d166..88ab814f6 100644 --- a/src/MEDCalculator/Makefile.am +++ b/src/MEDCalculator/Makefile.am @@ -20,8 +20,6 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST += CMakeLists.txt - MEDCALCULATOR_SUBDIRS = if !MED_ENABLE_MICROMED diff --git a/src/MEDCalculator/Swig/Makefile.am b/src/MEDCalculator/Swig/Makefile.am index a935106c3..ee89dcb6f 100644 --- a/src/MEDCalculator/Swig/Makefile.am +++ b/src/MEDCalculator/Swig/Makefile.am @@ -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 diff --git a/src/MEDCalculator/Test/Makefile.am b/src/MEDCalculator/Test/Makefile.am index 05159ce24..51f038f2c 100644 --- a/src/MEDCalculator/Test/Makefile.am +++ b/src/MEDCalculator/Test/Makefile.am @@ -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 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/MEDCouplingCorba/Client/Makefile.am b/src/MEDCouplingCorba/Client/Makefile.am index 69c629574..206ebba9a 100644 --- a/src/MEDCouplingCorba/Client/Makefile.am +++ b/src/MEDCouplingCorba/Client/Makefile.am @@ -20,8 +20,6 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST += CMakeLists.txt - lib_LTLIBRARIES= libmedcouplingclient.la salomeinclude_HEADERS= \ diff --git a/src/MEDCouplingCorba/Makefile.am b/src/MEDCouplingCorba/Makefile.am index 4b0b2b373..845f200bb 100644 --- a/src/MEDCouplingCorba/Makefile.am +++ b/src/MEDCouplingCorba/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 = . Client Test else diff --git a/src/MEDCouplingCorba/Test/Makefile.am b/src/MEDCouplingCorba/Test/Makefile.am index a3d626e29..b890e878f 100755 --- a/src/MEDCouplingCorba/Test/Makefile.am +++ b/src/MEDCouplingCorba/Test/Makefile.am @@ -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 \ diff --git a/src/MEDCouplingCorba_Swig/Client/Makefile.am b/src/MEDCouplingCorba_Swig/Client/Makefile.am index 68f06238c..1e7986d47 100644 --- a/src/MEDCouplingCorba_Swig/Client/Makefile.am +++ b/src/MEDCouplingCorba_Swig/Client/Makefile.am @@ -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 diff --git a/src/MEDCouplingCorba_Swig/Makefile.am b/src/MEDCouplingCorba_Swig/Makefile.am index 882fa3448..9199ac5d4 100644 --- a/src/MEDCouplingCorba_Swig/Makefile.am +++ b/src/MEDCouplingCorba_Swig/Makefile.am @@ -20,8 +20,6 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST += CMakeLists.txt - SUBDIRS = Client lib_LTLIBRARIES = _MEDCouplingCorba.la 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/Makefile.am b/src/MEDOP/Makefile.am index c41773e7e..7665cbe88 100644 --- a/src/MEDOP/Makefile.am +++ b/src/MEDOP/Makefile.am @@ -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 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/MEDOP/exe/Makefile.am b/src/MEDOP/exe/Makefile.am index 46d89fc8d..e2d4e9dd8 100644 --- a/src/MEDOP/exe/Makefile.am +++ b/src/MEDOP/exe/Makefile.am @@ -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 diff --git a/src/MEDOP/exe/appligen/Makefile.am b/src/MEDOP/exe/appligen/Makefile.am index edb07c5d6..5cf4227c4 100644 --- a/src/MEDOP/exe/appligen/Makefile.am +++ b/src/MEDOP/exe/appligen/Makefile.am @@ -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 \ diff --git a/src/MEDOP/gui/Makefile.am b/src/MEDOP/gui/Makefile.am index 0c6619963..60636afb8 100644 --- a/src/MEDOP/gui/Makefile.am +++ b/src/MEDOP/gui/Makefile.am @@ -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 diff --git a/src/MEDOP/tui/Makefile.am b/src/MEDOP/tui/Makefile.am index 6a82dd8f2..221ef3968 100644 --- a/src/MEDOP/tui/Makefile.am +++ b/src/MEDOP/tui/Makefile.am @@ -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 diff --git a/src/MedClient/Makefile.am b/src/MedClient/Makefile.am index bab8a24ac..3388c44cb 100644 --- a/src/MedClient/Makefile.am +++ b/src/MedClient/Makefile.am @@ -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 diff --git a/src/ParaMEDCouplingCorba/Makefile.am b/src/ParaMEDCouplingCorba/Makefile.am index 2403d6a01..c666fd114 100644 --- a/src/ParaMEDCouplingCorba/Makefile.am +++ b/src/ParaMEDCouplingCorba/Makefile.am @@ -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 ### 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