From 20db76fe2a9851b1b85773154fa41a0b67aa5894 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 5 Sep 2008 11:27:49 +0000 Subject: [PATCH] Improve build procedure to support 'make dist' and 'make distcheck' steps --- doc/Makefile.am | 51 ++++++++++++------------ doc/salome/Makefile.am | 6 +++ doc/salome/tui/Makefile.am | 8 ++-- idl/Makefile.am | 8 +++- salome_adm/unix/config_files/Makefile.am | 21 ++++------ src/Batch_SWIG/Makefile.am | 11 +++-- src/Communication_SWIG/Makefile.am | 9 ++--- src/DSC/DSC_Python/Makefile.am | 16 ++++---- src/LifeCycleCORBA_SWIG/Makefile.am | 9 ++--- src/Makefile.am | 2 + src/ModuleGenerator/Makefile.am | 2 + src/NOTIFICATION_SWIG/Makefile.am | 8 ++-- 12 files changed, 78 insertions(+), 73 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index cfa250da1..0ac5ffe77 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,21 +2,21 @@ # 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 +# 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 +# +# 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 +# +# 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 *- +# +# -* Makefile *- # # Author : Paul RASCLE (EDF) # Date : 06/02/2006 @@ -27,28 +27,27 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am SUBDIRS = salome -doc_DATA = - -if RST2HTML_IS_OK -# doc_DATA += \ -# index.html \ -# UnitTests.html \ -# SALOME_Application.html \ -# INSTALL.html \ -# kernel_resources.html \ -# KERNEL_Services.html -endif +# if RST2HTML_IS_OK +# DOC_FILES = \ +# index.html \ +# UnitTests.html \ +# SALOME_Application.html \ +# INSTALL.html \ +# kernel_resources.html \ +# KERNEL_Services.html +# CSS_FILE = rst.css +# endif -EXTRA_DIST=$(doc_DATA) +nodist_doc_DATA = $(DOC_FILES) +EXTRA_DIST=$(DOC_FILES:%.html=%.txt) $(CSS_FILE) # Building html from restructured text files -STYLESHEET=$(srcdir)/rst.css +STYLESHEET=$(CSS_FILE) RST2HTML=@RST2HTML@ RSTOPTS=--output-encoding=latin1 --stylesheet=$(STYLESHEET) -#RSTOPTS=--output-encoding=latin1 -%.html: $(srcdir)/%.txt +%.html: %.txt $(RST2HTML) $(RSTOPTS) $< $@ usr_docs: diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 9f43889c1..61011bb9b 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -45,10 +45,16 @@ dev_docs: index_html done; +# VSR: nullify these make targets to avoid 'make distcheck' failure +dvi: +pdf: +ps: + info_TEXINFOS = Batch.texi install-data-local: html usr_docs cp -rp $(top_builddir)/doc/salome/Batch.html $(DESTDIR)$(docdir) + uninstall-local: rm -rf $(DESTDIR)$(docdir)/Batch.html diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index 794840fc4..6bedc4bf9 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -63,10 +63,10 @@ usr_docs:KERNEL/main.html cp -fr $(srcdir)/KERNEL/exemple/ $(DESTDIR)$(docdir); uninstall-local: - chmod +w $(DESTDIR)$(docdir)/sources - chmod +w $(DESTDIR)$(docdir)/sources/static - chmod +w $(DESTDIR)$(docdir)/HTML - chmod +w $(DESTDIR)$(docdir)/exemple +# chmod +w $(DESTDIR)$(docdir)/sources +# chmod +w $(DESTDIR)$(docdir)/sources/static +# chmod +w $(DESTDIR)$(docdir)/HTML + chmod -R +w $(DESTDIR)$(docdir) rm -rf $(DESTDIR)$(docdir)/pythfilter.py find $(DESTDIR)$(docdir) -name "*.html" -type f -exec rm -rf {} \; find $(DESTDIR)$(docdir) -name "*.jpg" -type f -exec rm -rf {} \; diff --git a/idl/Makefile.am b/idl/Makefile.am index 05bad5140..7aa71ef3d 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -63,9 +63,13 @@ if MPI_IS_OK IDL_FILES += $(MPIIDL_FILES) endif +OTHER_IDL_FILES = \ + TestNotif.idl \ + TypeData.idl + # all the idl files are needed for make dist -EXTRA_DIST= $(BASEIDL_FILES) $(MPIIDL_FILES) \ - SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml +EXTRA_DIST= $(BASEIDL_FILES) $(MPIIDL_FILES) $(OTHER_IDL_FILES) \ + SALOME_Exception.xml SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml # This variable defines the files to be installed salomeidl_DATA = $(IDL_FILES) diff --git a/salome_adm/unix/config_files/Makefile.am b/salome_adm/unix/config_files/Makefile.am index 09742ebfe..dcc830a00 100644 --- a/salome_adm/unix/config_files/Makefile.am +++ b/salome_adm/unix/config_files/Makefile.am @@ -34,18 +34,11 @@ DEPRECATED_FILES=\ DEPRECATED/install-sh \ DEPRECATED/libtool.m4 \ DEPRECATED/ltconfig \ - DEPRECATED/ltmain.sh - -## The following scripts are required for modules not built with autotools -#dist_salomem4_SCRIPTS=\ -# compile \ -# config.guess \ -# config.sub \ -# depcomp \ -# install-sh \ -# ltmain.sh \ -# missing \ -# py-compile + DEPRECATED/ltmain.sh \ + DEPRECATED/check_Salome.m4 \ + DEPRECATED/check_java.m4 \ + DEPRECATED/missing \ + DEPRECATED/mkinstalldirs dist_salomem4_DATA=\ ac_cxx_depend_flag.m4 \ @@ -79,7 +72,9 @@ enable_pthreads.m4 \ production.m4 \ pyembed.m4 \ python.m4 \ -check_libxml.m4 +check_libxml.m4 \ +check_local.m4 \ +check_paco++.m4 dist_salome4depr_DATA=\ $(DEPRECATED_FILES) diff --git a/src/Batch_SWIG/Makefile.am b/src/Batch_SWIG/Makefile.am index 9fceccda1..ade2d7a75 100644 --- a/src/Batch_SWIG/Makefile.am +++ b/src/Batch_SWIG/Makefile.am @@ -50,14 +50,13 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # The library will be installed in the common place. # -BUILT_SOURCES = swig_wrap.cpp - SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../Batch SWIG_SOURCES = libBatch_Swig.i libBatch_Swig_exception.i libBatch_Swig_typemap.i -salomepython_PYTHON = libBatch_Swig.py -salomepyexec_LTLIBRARIES = _libBatch_Swig.la -_libBatch_Swig_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) +nodist_salomepython_PYTHON = libBatch_Swig.py +salomepyexec_LTLIBRARIES = _libBatch_Swig.la +nodist__libBatch_Swig_la_SOURCES = swig_wrap.cpp +_libBatch_Swig_la_SOURCES = $(SWIG_SOURCES) _libBatch_Swig_la_CPPFLAGS = @PYTHON_INCLUDES@ -I$(srcdir) -I$(srcdir)/../Batch _libBatch_Swig_la_LDFLAGS = -module _libBatch_Swig_la_LIBADD = ../Batch/libSalomeBatch.la @PYTHON_LIBS@ @@ -70,7 +69,7 @@ endif swig_wrap.cpp : $(SWIG_SOURCES) $(SWIG) $(SWIG_FLAGS) -o $@ $< -CLEANFILES = swig_wrap.cpp +CLEANFILES = swig_wrap.cpp libBatch_Swig.py # diff --git a/src/Communication_SWIG/Makefile.am b/src/Communication_SWIG/Makefile.am index 9dd1946a5..ca8676385 100644 --- a/src/Communication_SWIG/Makefile.am +++ b/src/Communication_SWIG/Makefile.am @@ -50,15 +50,14 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # The library will be installed in the common place. # -BUILT_SOURCES = swig_wrap.cpp - SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../Communication SWIG_SOURCES = libSALOME_Comm.i -salomepython_PYTHON = libSALOME_Comm.py +nodist_salomepython_PYTHON = libSALOME_Comm.py salomepyexec_LTLIBRARIES = _libSALOME_Comm.la -_libSALOME_Comm_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) +nodist__libSALOME_Comm_la_SOURCES = swig_wrap.cpp +_libSALOME_Comm_la_SOURCES = $(SWIG_SOURCES) _libSALOME_Comm_la_CPPFLAGS =\ @PYTHON_INCLUDES@ \ -I$(srcdir) -I$(srcdir)/../Communication \ @@ -85,7 +84,7 @@ endif swig_wrap.cpp : $(SWIG_SOURCES) $(SWIG) $(SWIG_FLAGS) -o $@ $< -CLEANFILES = swig_wrap.cpp +CLEANFILES = swig_wrap.cpp libSALOME_Comm.py # diff --git a/src/DSC/DSC_Python/Makefile.am b/src/DSC/DSC_Python/Makefile.am index d4f0d8e69..4122809c5 100644 --- a/src/DSC/DSC_Python/Makefile.am +++ b/src/DSC/DSC_Python/Makefile.am @@ -57,11 +57,13 @@ COMMON_LIBS = @CORBA_LIBS@ # AM_CFLAGS = -fexceptions -salomepython_PYTHON = calcium.py dsccalcium.py +salomepython_PYTHON = dsccalcium.py +nodist_salomepython_PYTHON = calcium.py salomepyexec_LTLIBRARIES = _calcium.la -MY_SWIG_FLAGS= $(SWIG_FLAGS) -noexcept -I$(top_srcdir)/src/DSC/DSC_User/Datastream/Calcium -SWIG_SRC=calcium.i -_calcium_la_SOURCES = calcium_wrap.cpp +MY_SWIG_FLAGS = $(SWIG_FLAGS) -noexcept -I$(top_srcdir)/src/DSC/DSC_User/Datastream/Calcium +SWIG_SRC = calcium.i +nodist__calcium_la_SOURCES = calcium_wrap.cpp +_calcium_la_SOURCES = $(SWIG_SRC) _calcium_la_LDFLAGS = -module _calcium_la_LIBADD = ../DSC_User/Datastream/Calcium/libCalciumC.la \ ../DSC_User/Datastream/libSalomeDatastream.la \ @@ -72,10 +74,8 @@ _calcium_la_LIBADD = ../DSC_User/Datastream/Calcium/libCalciumC.la \ _calcium_la_CXXFLAGS = $(PYTHON_INCLUDES) $(COMMON_CPPFLAGS) -EXTRA_DIST=calcium_wrap.cpp calcium.i - -calcium_wrap.cpp calcium.py:calcium.i +calcium_wrap.cpp calcium.py:$(SWIG_SRC) $(SWIG) $(MY_SWIG_FLAGS) -o calcium_wrap.cpp $< -CLEANFILES = calcium_wrap.cpp +CLEANFILES = calcium_wrap.cpp calcium.py diff --git a/src/LifeCycleCORBA_SWIG/Makefile.am b/src/LifeCycleCORBA_SWIG/Makefile.am index 60f4b8305..8e136ff4a 100644 --- a/src/LifeCycleCORBA_SWIG/Makefile.am +++ b/src/LifeCycleCORBA_SWIG/Makefile.am @@ -50,14 +50,13 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # The library will be installed in the same place. # -BUILT_SOURCES = swig_wrap.cpp - SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../LifeCycleCORBA -I$(srcdir)/../Utils SWIG_SOURCES = libSALOME_LifeCycleCORBA.i -salomepython_PYTHON = libSALOME_LifeCycleCORBA.py +nodist_salomepython_PYTHON = libSALOME_LifeCycleCORBA.py salomepyexec_LTLIBRARIES = _libSALOME_LifeCycleCORBA.la -_libSALOME_LifeCycleCORBA_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) +nodist__libSALOME_LifeCycleCORBA_la_SOURCES = swig_wrap.cpp +_libSALOME_LifeCycleCORBA_la_SOURCES = $(SWIG_SOURCES) _libSALOME_LifeCycleCORBA_la_CPPFLAGS =\ @PYTHON_INCLUDES@ \ -I$(srcdir) \ @@ -78,7 +77,7 @@ _libSALOME_LifeCycleCORBA_la_LIBADD = \ swig_wrap.cpp : $(SWIG_SOURCES) $(SWIG) $(SWIG_FLAGS) -o $@ $< -CLEANFILES = swig_wrap.cpp +CLEANFILES = swig_wrap.cpp libSALOME_LifeCycleCORBA.py # diff --git a/src/Makefile.am b/src/Makefile.am index 82efa8787..d2e4b2738 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -129,3 +129,5 @@ endif if WITH_PACO_PARALLEL SUBDIRS += $(SUBDIR_PARALLEL) endif + +EXTRA_DIST = win32pm diff --git a/src/ModuleGenerator/Makefile.am b/src/ModuleGenerator/Makefile.am index eb591327d..d2cbd3bcb 100644 --- a/src/ModuleGenerator/Makefile.am +++ b/src/ModuleGenerator/Makefile.am @@ -27,3 +27,5 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am dist_salomescript_DATA = IDLparser.py + +EXTRA_DIST = tests diff --git a/src/NOTIFICATION_SWIG/Makefile.am b/src/NOTIFICATION_SWIG/Makefile.am index d171e39a5..5e1f7629a 100644 --- a/src/NOTIFICATION_SWIG/Makefile.am +++ b/src/NOTIFICATION_SWIG/Makefile.am @@ -35,14 +35,14 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # (cf. http://www.geocities.com/foetsch/python/swig_linux.htm) # see also LifeCycleCORBA_SWIG # -BUILT_SOURCES = swig_wrap.cpp SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../Notification SWIG_SOURCES = NOTIFICATION.i -salomepython_PYTHON = libNOTIFICATION.py +nodist_salomepython_PYTHON = libNOTIFICATION.py salomepyexec_LTLIBRARIES = _libNOTIFICATION.la -_libNOTIFICATION_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) \ +nodist__libNOTIFICATION_la_SOURCES = swig_wrap.cpp +_libNOTIFICATION_la_SOURCES = $(SWIG_SOURCES) \ NOTIFICATION_Swig.cxx NOTIFICATION_Swig.hxx SALOME_NOTIFICATION_SWIG.hxx _libNOTIFICATION_la_CPPFLAGS =\ @PYTHON_INCLUDES@ -DHAVE_CONFIG_H \ @@ -59,4 +59,4 @@ _libNOTIFICATION_la_LIBADD = ../Notification/libSalomeNotification.la swig_wrap.cpp : $(SWIG_SOURCES) $(SWIG) $(SWIG_FLAGS) -o $@ $< -CLEANFILES = swig_wrap.cpp +CLEANFILES = swig_wrap.cpp libNOTIFICATION.py -- 2.39.2