From b2d779f576b909bb9595c5d619c3984942527ea2 Mon Sep 17 00:00:00 2001 From: prascle Date: Tue, 14 Feb 2006 19:15:57 +0000 Subject: [PATCH] PR: conditionnal compilation and make dist --- Makefile.am | 8 +- bin/Makefile.am | 4 +- doc/Makefile.in | 546 ++++++++++++++++++++-- idl/Makefile.am | 55 ++- resources/Makefile.am | 2 +- salome_adm/unix/Makefile.am | 2 +- src/Basics/Makefile.am | 4 +- src/Batch_SWIG/Makefile.am | 2 +- src/Communication/Makefile.am | 27 +- src/Container/Makefile.am | 20 +- src/DataTypeCatalog/Makefile.am | 13 +- src/GenericObj/Makefile.am | 14 +- src/LifeCycleCORBA/Makefile.am | 31 +- src/LifeCycleCORBA/Test/Makefile.am | 2 +- src/LifeCycleCORBA_SWIG/Makefile.am | 2 +- src/Logger/Makefile.am | 47 +- src/Logger/Test/Makefile.am | 2 +- src/MPIContainer/Makefile.am | 19 +- src/Makefile.am | 119 +++-- src/ModuleCatalog/Makefile.am | 17 +- src/ModuleGenerator/Makefile.am | 2 +- src/NamingService/Makefile.am | 10 +- src/NamingService/Test/Makefile.am | 2 +- src/Registry/Makefile.am | 16 +- src/ResourcesManager/Makefile.am | 12 +- src/RessourcesCatalog/Makefile.am | 13 +- src/SALOMEDS/Makefile.am | 322 +++++++++---- src/SALOMEDSImpl/Makefile.am | 135 ++++-- src/SALOMELocalTrace/Makefile.am | 24 +- src/SALOMELocalTrace/Test/Makefile.am | 2 +- src/SALOMETraceCollector/Makefile.am | 14 +- src/SALOMETraceCollector/Test/Makefile.am | 2 +- src/TOOLSDS/Makefile.am | 23 +- src/TestContainer/Makefile.am | 24 +- src/TestMPIContainer/Makefile.am | 19 +- src/UnitTests/Makefile.am | 24 +- src/Utils/Makefile.am | 16 +- src/Utils/Test/Makefile.am | 2 +- 38 files changed, 1246 insertions(+), 352 deletions(-) diff --git a/Makefile.am b/Makefile.am index fe33b60ab..e8bf882a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,10 @@ # $Header$ # -SUBDIRS = idl src doc salome_adm bin resources -#SUBDIRS = idl src +if CORBA_GEN + IDLDIR = idl +endif +SUBDIRS = $(IDLDIR) src doc salome_adm bin resources + +DIST_SUBDIRS= idl src doc salome_adm bin resources \ No newline at end of file diff --git a/bin/Makefile.am b/bin/Makefile.am index 20024d91a..ec1d25830 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -15,14 +15,14 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # # These files are data, module or lib files -salomescript_DATA= \ +dist_salomescript_DATA= \ VERSION \ orbmodule.py \ salome.launch \ salomeConsole.py # These files are executable scripts -salomescript_SCRIPTS=\ +dist_salomescript_SCRIPTS=\ envSalome.py \ runIDLparser \ runSalome.py \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 1cbecb620..bfb404216 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,50 +1,534 @@ +# Makefile.in generated by automake 1.9.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ # -* Makefile *- # -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 +# Author : Paul RASCLE (EDF) +# Date : 06/02/2006 # $Header$ # -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ -SUBDIRS= salome +#SUBDIRS = salome -@COMMENCE@ - -DOCFILES=\ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = ./doc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_template_options.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_warnings.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_cppunit.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_lam.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_local.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_lsf.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_mpi.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_opengl.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_openpbs.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_qt.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_sockets.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/production.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/python.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(docdir)" +docDATA_INSTALL = $(INSTALL_DATA) +DATA = $(doc_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +CAS_CPPFLAGS = @CAS_CPPFLAGS@ +CAS_CXXFLAGS = @CAS_CXXFLAGS@ +CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@ +CAS_KERNEL = @CAS_KERNEL@ +CAS_LDFLAGS = @CAS_LDFLAGS@ +CAS_LDPATH = @CAS_LDPATH@ +CAS_MATH = @CAS_MATH@ +CAS_MODELER = @CAS_MODELER@ +CAS_OCAF = @CAS_OCAF@ +CAS_OCAFVIS = @CAS_OCAFVIS@ +CAS_STDPLUGIN = @CAS_STDPLUGIN@ +CAS_TKTopAlgo = @CAS_TKTopAlgo@ +CAS_VIEWER = @CAS_VIEWER@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ +CORBA_GEN_FALSE = @CORBA_GEN_FALSE@ +CORBA_GEN_TRUE = @CORBA_GEN_TRUE@ +CORBA_INCLUDES = @CORBA_INCLUDES@ +CORBA_LIBS = @CORBA_LIBS@ +CORBA_ROOT = @CORBA_ROOT@ +CP = @CP@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ +CPPUNIT_IS_OK_FALSE = @CPPUNIT_IS_OK_FALSE@ +CPPUNIT_IS_OK_TRUE = @CPPUNIT_IS_OK_TRUE@ +CPPUNIT_LIBS = @CPPUNIT_LIBS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CXXTMPDPTHFLAGS = @CXXTMPDPTHFLAGS@ +CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ +CYGPATH_W = @CYGPATH_W@ +C_DEPEND_FLAG = @C_DEPEND_FLAG@ +DEFS = @DEFS@ +DEPCC = @DEPCC@ +DEPCXX = @DEPCXX@ +DEPCXXFLAGS = @DEPCXXFLAGS@ +DEPDIR = @DEPDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ +DVIPS = @DVIPS@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +HAVE_SSTREAM = @HAVE_SSTREAM@ +HDF5_INCLUDES = @HDF5_INCLUDES@ +HDF5_LIBS = @HDF5_LIBS@ +HDF5_MT_LIBS = @HDF5_MT_LIBS@ +IDL = @IDL@ +IDLCXXFLAGS = @IDLCXXFLAGS@ +IDLPYFLAGS = @IDLPYFLAGS@ +IDL_CLN_CXX = @IDL_CLN_CXX@ +IDL_CLN_H = @IDL_CLN_H@ +IDL_CLN_OBJ = @IDL_CLN_OBJ@ +IDL_SRV_CXX = @IDL_SRV_CXX@ +IDL_SRV_H = @IDL_SRV_H@ +IDL_SRV_OBJ = @IDL_SRV_OBJ@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LATEX = @LATEX@ +LDEXPDYNFLAGS = @LDEXPDYNFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LSF_INCLUDES = @LSF_INCLUDES@ +LSF_LDFLAGS = @LSF_LDFLAGS@ +LSF_LIBS = @LSF_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MACHINE = @MACHINE@ +MAKEINFO = @MAKEINFO@ +MOC = @MOC@ +MPI_INCLUDES = @MPI_INCLUDES@ +MPI_IS_OK_FALSE = @MPI_IS_OK_FALSE@ +MPI_IS_OK_TRUE = @MPI_IS_OK_TRUE@ +MPI_LIBS = @MPI_LIBS@ +OBJEXT = @OBJEXT@ +OGL_INCLUDES = @OGL_INCLUDES@ +OGL_LIBS = @OGL_LIBS@ +OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ +OMNIORB_IDL = @OMNIORB_IDL@ +OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ +OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ +OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ +OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ +OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ +OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ +OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@ +OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@ +OMNIORB_INCLUDES = @OMNIORB_INCLUDES@ +OMNIORB_LIBS = @OMNIORB_LIBS@ +OMNIORB_ROOT = @OMNIORB_ROOT@ +OPENPBS = @OPENPBS@ +OPENPBS_INCLUDES = @OPENPBS_INCLUDES@ +OPENPBS_LIBDIR = @OPENPBS_LIBDIR@ +OPENPBS_LIBS = @OPENPBS_LIBS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +PYTHON = @PYTHON@ +PYTHONHOME = @PYTHONHOME@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE = @PYTHON_SITE@ +PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@ +PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ +PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@ +PYTHON_VERSION = @PYTHON_VERSION@ +QTDIR = @QTDIR@ +QT_INCLUDES = @QT_INCLUDES@ +QT_LIBS = @QT_LIBS@ +QT_MT_INCLUDES = @QT_MT_INCLUDES@ +QT_MT_LIBS = @QT_MT_LIBS@ +QT_ROOT = @QT_ROOT@ +QT_VERS = @QT_VERS@ +RANLIB = @RANLIB@ +RCP = @RCP@ +RM = @RM@ +ROOT_BUILDDIR = @ROOT_BUILDDIR@ +ROOT_SRCDIR = @ROOT_SRCDIR@ +RSH = @RSH@ +RST2HTML = @RST2HTML@ +SCP = @SCP@ +SETX = @SETX@ +SET_MAKE = @SET_MAKE@ +SH = @SH@ +SHELL = @SHELL@ +SOCKETFLAGS = @SOCKETFLAGS@ +SOCKETLIBS = @SOCKETLIBS@ +SSH = @SSH@ +STDLIB = @STDLIB@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_FLAGS = @SWIG_FLAGS@ +UIC = @UIC@ +VERSION = @VERSION@ +WITHMPI = @WITHMPI@ +WITHOPENPBS = @WITHOPENPBS@ +WITH_BATCH = @WITH_BATCH@ +WITH_BATCH_FALSE = @WITH_BATCH_FALSE@ +WITH_BATCH_TRUE = @WITH_BATCH_TRUE@ +WITH_LOCAL = @WITH_LOCAL@ +WITH_LOCAL_FALSE = @WITH_LOCAL_FALSE@ +WITH_LOCAL_TRUE = @WITH_LOCAL_TRUE@ +WITH_LSF = @WITH_LSF@ +WITH_LSF_FALSE = @WITH_LSF_FALSE@ +WITH_LSF_TRUE = @WITH_LSF_TRUE@ +WITH_OPENPBS_FALSE = @WITH_OPENPBS_FALSE@ +WITH_OPENPBS_TRUE = @WITH_OPENPBS_TRUE@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +acx_pthread_config = @acx_pthread_config@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +cppunit_ok = @cppunit_ok@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +mpi_ok = @mpi_ok@ +oldincludedir = @oldincludedir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +docdir = $(datadir)/doc +doc_DATA = \ index.html \ UnitTests.html \ SALOME_Application.html \ INSTALL.html -# The production rule for creating html from restructured text txt is -# defined in the makefile header @COMMENCE@. -rstdoc: $(DOCFILES) +EXTRA_DIST = $(doc_DATA) -docs: rstdoc - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done -clean: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done +# Building html from restructured text files +STYLESHEET = rst.css +#RSTOPTS=--output-encoding=latin1 --stylesheet=$(STYLESHEET) +RSTOPTS = --output-encoding=latin1 +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ./doc/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu ./doc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ + $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ done -install: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + @list='$(doc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ + rm -f "$(DESTDIR)$(docdir)/$$f"; \ done +tags: TAGS +TAGS: -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(docdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-docDATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-docDATA uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-docDATA install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-docDATA uninstall-info-am + + +%.html: $(srcdir)/%.txt + $(RST2HTML) $(RSTOPTS) $< $@ +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/idl/Makefile.am b/idl/Makefile.am index fd7b7e893..c5652ba3e 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -35,20 +35,26 @@ if MPI_IS_OK IDL_FILES += $(MPIIDL_FILES) endif +# all the idl files are needed for make dist EXTRA_DIST= $(BASEIDL_FILES) $(MPIIDL_FILES) # This variable defines the files to be installed salomeidl_DATA = $(IDL_FILES) -# These variables defines the file extentions for clt and srv CORBA -# files generated from the IDL files. -OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ -OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ -OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ +# Sources built from idl files +# BUILT_SOURCE = first thing done on make all +# idl dependencies are checked and rebuilt first -OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ -OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ -OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ +BUILT_SOURCES =\ + .depidl $(IDL_FILES:%.idl=%SK.cc) $(IDL_FILES:%.idl=%.hh) + +nodist_include_HEADERS = $(IDL_FILES:%.idl=%.hh) +nodist_prog_SOURCES = $(IDL_FILES:%.idl=%SK.cc) + +dist_hook: + echo "menage final -----------------------------------------" + rm -f $(distdir)/*.hh $(distdir)/*SK.cc $(distdir)/.depidl + echo "menage final -----------------------------------------" # These variables defines the building process of CORBA files OMNIORB_IDL = @OMNIORB_IDL@ @@ -57,14 +63,15 @@ OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/salome/idl IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/salome/idl IDLPYFLAGS = @IDLPYFLAGS@ - -# Target for generating the stub from the IDL files. The stubs are -# created in the current build directory. -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_srcdir}/idl/%.idl +# potential problem on parallel make on the following - multiple outputs +SUFFIXES = .idl .hh SK.cc +.idlSK.cc: + $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< +.idl.hh: $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -all: $(IDL_FILES:%.idl=%$(OMNIORB_IDL_CLN_CXX)) $(IDL_FILES:%.idl=%$(OMNIORB_IDL_CLN_H)) +#%SK.cc %.hh : %.idl +# $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< # This target overload the standard definition of install. The target # install-pyidl is added to process python corba stubs for SALOME. @@ -75,3 +82,23 @@ install-pyidl: $(IDL_FILES:%=$(top_srcdir)/idl/%) ls $^ | while read file; do \ $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \ done + +mostlyclean-local: + -rm -f *.hh *.cc .depidl + +# we use cpp to generate dependencies between idl files. +# option x c tells the preprocessor to consider idl as a c file. +# if an idl is modified, all idl dependencies are rebuilt + +.depidl: $(IDL_FILES) + @echo "" > $@ + @for dep in $^ dummy; do \ + if [ $$dep != "dummy" ]; then \ + echo Building dependencies for $$dep; \ + $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) $$dep 2>/dev/null | \ + sed 's/\.o/\SK.cc/' >>$@; \ + fi; \ + done ; + +-include .depidl + diff --git a/resources/Makefile.am b/resources/Makefile.am index 15f1bd13c..393d0cdd9 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -14,7 +14,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # -salomeres_DATA=\ +dist_salomeres_DATA=\ CatalogDataType.xml \ KERNELCatalog.xml \ CatalogResources.xml \ diff --git a/salome_adm/unix/Makefile.am b/salome_adm/unix/Makefile.am index c918f9394..b1f868738 100644 --- a/salome_adm/unix/Makefile.am +++ b/salome_adm/unix/Makefile.am @@ -15,7 +15,7 @@ DEPRECATED_FILES=\ # The deprecated files are deprecated for the KERNEL but not for the # related modules (GUI, MED, ...), for now. Some files have to be installed. -salomeadmux_DATA=\ +dist_salomeadmux_DATA=\ SALOMEconfig.h.in \ pythonbe.py \ $(DEPRECATED_FILES) diff --git a/src/Basics/Makefile.am b/src/Basics/Makefile.am index 954fe3cc6..0203ea726 100644 --- a/src/Basics/Makefile.am +++ b/src/Basics/Makefile.am @@ -31,6 +31,8 @@ salomeinclude_HEADERS = BasicsGenericDestructor.hxx libdir = $(prefix)/lib/@PACKAGE@ lib_LTLIBRARIES = libSALOMEBasics.la -libSALOMEBasics_la_SOURCES = BasicsGenericDestructor.cxx BasicsGenericDestructor.hxx +libSALOMEBasics_la_SOURCES = \ + BasicsGenericDestructor.cxx \ + BasicsGenericDestructor.hxx libSALOMEBasics_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSALOMEBasics_la_CPPFLAGS = @CPPFLAGS@ diff --git a/src/Batch_SWIG/Makefile.am b/src/Batch_SWIG/Makefile.am index 3de642dc0..ab62e74e7 100644 --- a/src/Batch_SWIG/Makefile.am +++ b/src/Batch_SWIG/Makefile.am @@ -80,7 +80,7 @@ CLEANFILES = swig_wrap.cpp # # Scripts to be installed. -salomescript_SCRIPTS = Batch_test.py +dist_salomescript_SCRIPTS = Batch_test.py # You don't need to specify libBatch_Swig.py. It is automatically # installed by means of the swig target pkgpython_PYTHON. diff --git a/src/Communication/Makefile.am b/src/Communication/Makefile.am index a1e0ef50e..36f64a4a6 100644 --- a/src/Communication/Makefile.am +++ b/src/Communication/Makefile.am @@ -21,9 +21,17 @@ salomeinclude_HEADERS = \ # =============================================================== # # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_Comm.hh $(top_builddir)/idl/SALOME_CommSK.cc \ - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_Comm.hh \ + $(top_builddir)/idl/SALOME_Exception.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_CommSK.cc \ + $(top_builddir)/idl/SALOME_ExceptionSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -58,7 +66,18 @@ libSalomeCommunication_la_SOURCES =\ MultiCommException.cxx \ SALOMEMultiComm.cxx \ ReceiverFactory.cxx \ - $(BUILT_SOURCES) + \ + MultiCommException.hxx \ + SALOME_Comm_i.hxx \ + SenderFactory.hxx \ + ReceiverFactory.hxx \ + SALOMEMultiComm.hxx \ + Receivers.hxx \ + Receiver.hxx \ + $(IDL_SOURCES) + +# the following file is needed by an include file (VERY DIRTY!) +EXTRA_DIST = Receivers.cxx libSalomeCommunication_la_CPPFLAGS = $(COMMON_CPPFLAGS) $(OPT_CPPFLAGS) libSalomeCommunication_la_LDFLAGS = -no-undefined -version-info=0:0:0 $(OPT_LDFLAGS) diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am index 805755184..7af6f5ca5 100644 --- a/src/Container/Makefile.am +++ b/src/Container/Makefile.am @@ -42,12 +42,12 @@ salomeinclude_HEADERS = \ Container_init_python.hxx # Scripts to be installed -salomescript_DATA =\ +dist_salomescript_DATA =\ SALOME_ComponentPy.py \ SALOME_Container.py # These files are executable scripts -salomescript_SCRIPTS=\ +dist_salomescript_SCRIPTS=\ SALOME_ContainerPy.py # @@ -57,9 +57,17 @@ salomescript_SCRIPTS=\ # # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_ContainerManager.hh $(top_builddir)/idl/SALOME_ContainerManagerSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_Component.hh \ + $(top_builddir)/idl/SALOME_ContainerManager.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_ContainerManagerSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -102,7 +110,7 @@ libSalomeContainer_la_SOURCES=\ Container_i.cxx \ SALOME_ContainerManager.cxx \ Container_init_python.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libSalomeContainer_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) diff --git a/src/DataTypeCatalog/Makefile.am b/src/DataTypeCatalog/Makefile.am index 57e174bb1..dce244b6b 100644 --- a/src/DataTypeCatalog/Makefile.am +++ b/src/DataTypeCatalog/Makefile.am @@ -46,8 +46,15 @@ salomeinclude_HEADERS = \ # # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_DataTypeCatalog.hh $(top_builddir)/idl/SALOME_DataTypeCatalogSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_DataTypeCatalog.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_DataTypeCatalogSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -76,7 +83,7 @@ lib_LTLIBRARIES = libSalomeDataTypeCatalog.la libSalomeDataTypeCatalog_la_SOURCES=\ SALOME_DataTypeCatalog_Handler.cxx \ SALOME_DataTypeCatalog_impl.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libSalomeDataTypeCatalog_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) \ diff --git a/src/GenericObj/Makefile.am b/src/GenericObj/Makefile.am index aa151b4cd..c3017773c 100644 --- a/src/GenericObj/Makefile.am +++ b/src/GenericObj/Makefile.am @@ -11,15 +11,23 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am salomeinclude_HEADERS =\ SALOME_GenericObj_i.hh -# The BUILT_SOURCES defines the list of files generated from the idl +# The IDL_SOURCES defines the list of files generated from the idl # interface (SALOME_GenericObj.idl in this case). -BUILT_SOURCES = $(top_builddir)/idl/SALOME_GenericObj.hh $(top_builddir)/idl/SALOME_GenericObjSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_GenericObj.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_GenericObjSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # Libraries targets lib_LTLIBRARIES = libSalomeGenericObj.la libSalomeGenericObj_la_SOURCES =\ SALOME_GenericObj_i.cc \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libSalomeGenericObj_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeGenericObj_la_CPPFLAGS = \ diff --git a/src/LifeCycleCORBA/Makefile.am b/src/LifeCycleCORBA/Makefile.am index e6cdddc24..18a9a7290 100644 --- a/src/LifeCycleCORBA/Makefile.am +++ b/src/LifeCycleCORBA/Makefile.am @@ -38,7 +38,7 @@ salomeinclude_HEADERS = \ SALOME_LifeCycleCORBA.hxx # Scripts to be installed -salomescript_DATA =\ +dist_salomescript_DATA =\ Launchers.py # @@ -48,12 +48,23 @@ salomescript_DATA =\ # # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_TestComponent.hh $(top_builddir)/idl/SALOME_TestComponentSK.cc \ - $(top_builddir)/idl/SALOME_ContainerManager.hh $(top_builddir)/idl/SALOME_ContainerManagerSK.cc \ - $(top_builddir)/idl/SALOME_ModuleCatalog.hh $(top_builddir)/idl/SALOME_ModuleCatalogSK.cc \ - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_Component.hh \ + $(top_builddir)/idl/SALOME_TestComponent.hh \ + $(top_builddir)/idl/SALOME_ContainerManager.hh \ + $(top_builddir)/idl/SALOME_ModuleCatalog.hh \ + $(top_builddir)/idl/SALOME_Exception.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_TestComponentSK.cc \ + $(top_builddir)/idl/SALOME_ContainerManagerSK.cc \ + $(top_builddir)/idl/SALOME_ModuleCatalogSK.cc \ + $(top_builddir)/idl/SALOME_ExceptionSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -82,7 +93,11 @@ COMMON_LIBS =\ # =============================================================== # lib_LTLIBRARIES = libSalomeLifeCycleCORBA.la -libSalomeLifeCycleCORBA_la_SOURCES = SALOME_LifeCycleCORBA.cxx Launchers.cxx $(BUILT_SOURCES) +libSalomeLifeCycleCORBA_la_SOURCES = \ + SALOME_LifeCycleCORBA.cxx \ + Launchers.cxx \ + Launchers.hxx \ + $(IDL_SOURCES) libSalomeLifeCycleCORBA_la_CPPFLAGS = \ $(COMMON_CPPFLAGS) \ @PYTHON_INCLUDES@ \ diff --git a/src/LifeCycleCORBA/Test/Makefile.am b/src/LifeCycleCORBA/Test/Makefile.am index c637e1284..cd09fa879 100644 --- a/src/LifeCycleCORBA/Test/Makefile.am +++ b/src/LifeCycleCORBA/Test/Makefile.am @@ -38,7 +38,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am salomeinclude_HEADERS= LifeCycleCORBATest.hxx # Scripts to be installed -salomescript_SCRIPTS = TestLifeCycleCORBA.py +dist_salomescript_SCRIPTS = TestLifeCycleCORBA.py # # =============================================================== diff --git a/src/LifeCycleCORBA_SWIG/Makefile.am b/src/LifeCycleCORBA_SWIG/Makefile.am index c3eaa963d..e81652376 100644 --- a/src/LifeCycleCORBA_SWIG/Makefile.am +++ b/src/LifeCycleCORBA_SWIG/Makefile.am @@ -86,7 +86,7 @@ CLEANFILES = swig_wrap.cpp # # Scripts to be installed. -salomescript_DATA =\ +dist_salomescript_DATA =\ LifeCycleCORBA.py \ TestLifeCycleCORBA.py diff --git a/src/Logger/Makefile.am b/src/Logger/Makefile.am index 0371578ff..d55a4935e 100644 --- a/src/Logger/Makefile.am +++ b/src/Logger/Makefile.am @@ -21,23 +21,35 @@ salomeinclude_HEADERS = \ # Program files bin_PROGRAMS = SALOME_Logger_Server -SALOME_Logger_Server_SOURCES = SALOME_Logger_Server_main.cxx +SALOME_Logger_Server_SOURCES = \ + SALOME_Logger_Server_main.cxx \ + SALOME_Logger_Server.hxx + SALOME_Logger_Server_LDADD = libSalomeLoggerServer.la SALOME_Logger_Server_CPPFLAGS =\ -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -# The BUILT_SOURCES defines the list of files generated from the idl +# The IDL_SOURCES defines the list of files generated from the idl # interface (Logger.idl in this case). -BUILT_SOURCES = $(top_builddir)/idl/Logger.hh $(top_builddir)/idl/LoggerSK.cc + +nodist_include_HEADERS = \ + $(top_builddir)/idl/Logger.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/LoggerSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # Libraries targets lib_LTLIBRARIES = libSalomeLoggerServer.la libSalomeLoggerServer_la_SOURCES =\ SALOME_Trace.cxx \ SALOME_Logger_Server.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libSalomeLoggerServer_la_CPPFLAGS =\ -I$(top_builddir)/salome_adm/unix \ @@ -48,30 +60,5 @@ libSalomeLoggerServer_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeLoggerServer_la_LIBADD = @CORBA_LIBS@ # Scripts target -salomescript_DATA = SALOME_Trace.py - - -# _CS_gbo For a better management of dependencies, we should define a -# building target linking the generated files to idl source files in -# this directory (for a future version) -# These variables defines the building process of CORBA files -#OMNIORB_IDL = @OMNIORB_IDL@ -#OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -#OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/salome/idl -#IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/salome/idl - -#Logger.hh LoggerSK.cc: $(top_srcdir)/idl/Logger.idl -# $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -#LIB_SERVER_IDL = Logger.idl - - -# Executables targets -#bin_SCRIPTS = SALOME_Trace.py -#bin_PROGRAMS = SALOME_Logger_Server - -#EXPORT_PYSCRIPTS = SALOME_Trace.py - +dist_salomescript_DATA = SALOME_Trace.py -#BIN_SERVER_IDL = Logger.idl -#BIN_CLIENT_IDL = Logger.idl diff --git a/src/Logger/Test/Makefile.am b/src/Logger/Test/Makefile.am index 357b3b757..1375410c6 100644 --- a/src/Logger/Test/Makefile.am +++ b/src/Logger/Test/Makefile.am @@ -36,4 +36,4 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # # Executable scripts to be installed -salomescript_SCRIPTS = TestKiller.py +dist_salomescript_SCRIPTS = TestKiller.py diff --git a/src/MPIContainer/Makefile.am b/src/MPIContainer/Makefile.am index 43fc715cd..fbd5a1899 100644 --- a/src/MPIContainer/Makefile.am +++ b/src/MPIContainer/Makefile.am @@ -53,10 +53,19 @@ salomeinclude_HEADERS = \ # =============================================================== # # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_MPIObject.hh $(top_builddir)/idl/SALOME_MPIObjectSK.cc \ - $(top_builddir)/idl/SALOME_MPIContainer.hh $(top_builddir)/idl/SALOME_MPIContainerSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_Component.hh \ + $(top_builddir)/idl/SALOME_MPIObject.hh \ + $(top_builddir)/idl/SALOME_MPIContainer.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_MPIObjectSK.cc \ + $(top_builddir)/idl/SALOME_MPIContainerSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. @@ -94,7 +103,7 @@ COMMON_LIBS =\ # =============================================================== # lib_LTLIBRARIES = libSalomeMPIContainer.la -libSalomeMPIContainer_la_SOURCES = MPIObject_i.cxx MPIContainer_i.cxx $(BUILT_SOURCES) +libSalomeMPIContainer_la_SOURCES = MPIObject_i.cxx MPIContainer_i.cxx $(IDL_SOURCES) libSalomeMPIContainer_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSalomeMPIContainer_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeMPIContainer_la_LIBADD = $(COMMON_LIBS) diff --git a/src/Makefile.am b/src/Makefile.am index fe3b8750c..929ce5401 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,36 +24,68 @@ # Module : KERNEL # $Header$ -SUBDIRS = \ - Basics \ - SALOMELocalTrace \ - CASCatch \ - HDFPersist \ - Logger \ - SALOMETraceCollector \ - Utils \ - NamingService \ - GenericObj \ - Registry \ - ModuleCatalog \ - DataTypeCatalog \ - RessourcesCatalog \ - ResourcesManager \ - Notification \ - NOTIFICATION_SWIG \ - Container \ - TestContainer \ - LifeCycleCORBA \ - LifeCycleCORBA_SWIG \ - SALOMEDSClient \ - TOOLSDS \ - SALOMEDSImpl \ - SALOMEDS \ - KERNEL_PY \ - ModuleGenerator \ - Communication \ - Communication_SWIG +SUBDIR_BASE = \ + Basics \ + SALOMELocalTrace \ + CASCatch \ + HDFPersist +SUBDIR_CORBA = \ + Logger \ + SALOMETraceCollector \ + Utils \ + NamingService \ + GenericObj \ + Registry \ + ModuleCatalog \ + DataTypeCatalog \ + RessourcesCatalog \ + ResourcesManager \ + Notification \ + NOTIFICATION_SWIG \ + Container \ + TestContainer \ + LifeCycleCORBA \ + LifeCycleCORBA_SWIG \ + SALOMEDSClient \ + TOOLSDS \ + SALOMEDSImpl \ + SALOMEDS \ + KERNEL_PY \ + ModuleGenerator \ + Communication \ + Communication_SWIG + +SUBDIR_CPPUNIT_BASE= \ + Basics/Test \ + SALOMELocalTrace/Test + +SUBDIR_CPPUNIT_CORBA = \ + Logger/Test \ + SALOMETraceCollector/Test \ + Utils/Test \ + NamingService/Test \ + LifeCycleCORBA/Test + +SUBDIR_CPPUNIT_GENERAL = \ + UnitTests + +SUBDIR_MPI = \ + MPIContainer \ + TestMPIContainer + +SUBDIR_BATCH= \ + Batch \ + Batch_SWIG + +DIST_SUBDIRS = \ + $(SUBDIR_BASE) \ + $(SUBDIR_CORBA) \ + $(SUBDIR_MPI) \ + $(SUBDIR_BATCH) \ + $(SUBDIR_CPPUNIT_BASE) \ + $(SUBDIR_CPPUNIT_CORBA) \ + $(SUBDIR_CPPUNIT_GENERAL) # # The following packages are built under conditions. @@ -61,25 +93,28 @@ SUBDIRS = \ # check_cppunit for example with CPPUNIT_IS_OK. # -if CPPUNIT_IS_OK - SUBDIRS+= \ - Basics/Test \ - SALOMELocalTrace/Test \ - Logger/Test \ - SALOMETraceCollector/Test \ - Utils/Test \ - NamingService/Test \ - LifeCycleCORBA/Test \ - UnitTests -endif +SUBDIRS = $(SUBDIR_BASE) +if CORBA_GEN + SUBDIRS += $(SUBDIR_CORBA) +endif if MPI_IS_OK - SUBDIRS+= MPIContainer TestMPIContainer + SUBDIRS += $(SUBDIR_MPI) endif if WITH_BATCH - SUBDIRS += Batch Batch_SWIG + SUBDIRS += $(SUBDIR_BATCH) endif +if CPPUNIT_IS_OK + SUBDIRS += $(SUBDIR_CPPUNIT_BASE) +endif +if CORBA_GEN + SUBDIRS += $(SUBDIR_CPPUNIT_CORBA) +endif + +if CPPUNIT_IS_OK + SUBDIRS += $(SUBDIR_CPPUNIT_GENERAL) +endif diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am index 45678c79f..6c70a7a96 100644 --- a/src/ModuleCatalog/Makefile.am +++ b/src/ModuleCatalog/Makefile.am @@ -43,7 +43,7 @@ salomeinclude_HEADERS = \ SALOME_ModuleCatalog_Handler.hxx # Scripts to be installed -salomescript_DATA = SALOME_TestModuleCatalog.py +dist_salomescript_DATA = SALOME_TestModuleCatalog.py # @@ -54,10 +54,17 @@ salomescript_DATA = SALOME_TestModuleCatalog.py lib_LTLIBRARIES = libSalomeCatalog.la # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_ModuleCatalog.hh $(top_builddir)/idl/SALOME_ModuleCatalogSK.cc \ - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_ModuleCatalog.hh \ + $(top_builddir)/idl/SALOME_Exception.hh +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_ModuleCatalogSK.cc \ + $(top_builddir)/idl/SALOME_ExceptionSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -82,7 +89,7 @@ libSalomeCatalog_la_SOURCES =\ SALOME_ModuleCatalog_Parser_IO.cxx \ SALOME_ModuleCatalog_impl.cxx \ SALOME_ModuleCatalog_Acomponent_impl.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libSalomeCatalog_la_CPPFLAGS =\ -ftemplate-depth-32 \ diff --git a/src/ModuleGenerator/Makefile.am b/src/ModuleGenerator/Makefile.am index 017c82625..afdb659f1 100644 --- a/src/ModuleGenerator/Makefile.am +++ b/src/ModuleGenerator/Makefile.am @@ -26,4 +26,4 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am -salomescript_DATA = IDLparser.py +dist_salomescript_DATA = IDLparser.py diff --git a/src/NamingService/Makefile.am b/src/NamingService/Makefile.am index ca4cb8859..0c8142ff7 100644 --- a/src/NamingService/Makefile.am +++ b/src/NamingService/Makefile.am @@ -35,13 +35,13 @@ salomeinclude_HEADERS =\ NamingService_WaitForServerReadiness.hxx # Scripts to be exported -salomescript_DATA =\ +dist_salomescript_DATA =\ SALOME_NamingServicePy.py -# The BUILT_SOURCES defines the list of files generated from the idl +# The IDL_SOURCES defines the list of files generated from the idl # interface (SALOME_Exception.idl in this case). -BUILT_SOURCES = $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc +#IDL_SOURCES = $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc # Libraries targets @@ -50,8 +50,8 @@ libSalomeNS_la_SOURCES =\ SALOME_NamingService.cxx \ ServiceUnreachable.cxx \ NamingService_WaitForServerReadiness.cxx - $(BUILT_SOURCES) -# _CS_gbo We don't need to add the BUILT_SOURCES files because the +# $(IDL_SOURCES) +# _CS_gbo We don't need to add the IDL_SOURCES files because the # symbols needed from this sources are given by the linked libraries # (libOptUtil.la). Meanwhile, the symbols could be duplicated here and # no error would occur. An other reason to add it is that the diff --git a/src/NamingService/Test/Makefile.am b/src/NamingService/Test/Makefile.am index c9720d503..18abab3a1 100644 --- a/src/NamingService/Test/Makefile.am +++ b/src/NamingService/Test/Makefile.am @@ -37,7 +37,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am salomeinclude_HEADERS= NamingServiceTest.hxx # Scripts to be installed -salomescript_SCRIPTS = TestNamingService.py +dist_salomescript_SCRIPTS = TestNamingService.py # diff --git a/src/Registry/Makefile.am b/src/Registry/Makefile.am index 6698f9d3a..0ca8a56b2 100644 --- a/src/Registry/Makefile.am +++ b/src/Registry/Makefile.am @@ -33,16 +33,24 @@ salomeinclude_HEADERS =\ RegistryConnexion.hxx \ RegistryService.hxx -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_Registry.hh $(top_builddir)/idl/SALOME_RegistrySK.cc \ - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_Registry.hh \ + $(top_builddir)/idl/SALOME_Exception.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_RegistrySK.cc \ + $(top_builddir)/idl/SALOME_ExceptionSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # Libraries targets lib_LTLIBRARIES = libRegistry.la libRegistry_la_SOURCES =\ RegistryConnexion.cxx \ RegistryService.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libRegistry_la_LDFLAGS = -no-undefined -version-info=0:0:0 libRegistry_la_CPPFLAGS =\ diff --git a/src/ResourcesManager/Makefile.am b/src/ResourcesManager/Makefile.am index c163ef141..99f2bfc8c 100755 --- a/src/ResourcesManager/Makefile.am +++ b/src/ResourcesManager/Makefile.am @@ -47,9 +47,15 @@ salomeinclude_HEADERS = \ # # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_ContainerManager.hh $(top_builddir)/idl/SALOME_ContainerManagerSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_ContainerManager.hh +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_ContainerManagerSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -77,7 +83,7 @@ libSalomeResourcesManager_la_SOURCES =\ SALOME_ResourcesCatalog_Handler.cxx \ SALOME_LoadRateManager.cxx \ SALOME_ResourcesManager.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libSalomeResourcesManager_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) \ diff --git a/src/RessourcesCatalog/Makefile.am b/src/RessourcesCatalog/Makefile.am index 948e27e35..382674a88 100644 --- a/src/RessourcesCatalog/Makefile.am +++ b/src/RessourcesCatalog/Makefile.am @@ -48,8 +48,15 @@ salomeinclude_HEADERS = \ # # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_RessourcesCatalog.hh $(top_builddir)/idl/SALOME_RessourcesCatalogSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_RessourcesCatalog.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_RessourcesCatalogSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -78,7 +85,7 @@ lib_LTLIBRARIES = libSalomeRessourcesCatalog.la libSalomeRessourcesCatalog_la_SOURCES=\ SALOME_RessourcesCatalog_Handler.cxx \ SALOME_RessourcesCatalog_impl.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libSalomeRessourcesCatalog_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) \ diff --git a/src/SALOMEDS/Makefile.am b/src/SALOMEDS/Makefile.am index b7bacf740..228a9b344 100644 --- a/src/SALOMEDS/Makefile.am +++ b/src/SALOMEDS/Makefile.am @@ -25,7 +25,7 @@ salomeinclude_HEADERS= \ SALOMEDS_GenericAttribute.hxx # Scripts to be installed -salomescript_DATA = SALOME_DriverPy.py +dist_salomescript_DATA = SALOME_DriverPy.py # # =============================================================== @@ -34,12 +34,23 @@ salomescript_DATA = SALOME_DriverPy.py # # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOMEDS.hh $(top_builddir)/idl/SALOMEDSSK.cc \ - $(top_builddir)/idl/SALOMEDS_Attributes.hh $(top_builddir)/idl/SALOMEDS_AttributesSK.cc \ - $(top_builddir)/idl/SALOME_GenericObj.hh $(top_builddir)/idl/SALOME_GenericObjSK.cc \ - $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOMEDS.hh \ + $(top_builddir)/idl/SALOMEDS_Attributes.hh \ + $(top_builddir)/idl/SALOME_GenericObj.hh \ + $(top_builddir)/idl/SALOME_Component.hh \ + $(top_builddir)/idl/SALOME_Exception.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOMEDSSK.cc \ + $(top_builddir)/idl/SALOMEDS_AttributesSK.cc \ + $(top_builddir)/idl/SALOME_GenericObjSK.cc \ + $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_ExceptionSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -87,85 +98,224 @@ COMMON_LIBS =\ # lib_LTLIBRARIES = libSalomeDS.la libSalomeDS_la_SOURCES = \ - SALOMEDS.cxx \ - SALOMEDS_Driver_i.cxx \ - SALOMEDS_StudyManager_i.cxx \ - SALOMEDS_UseCaseBuilder_i.cxx \ - SALOMEDS_UseCaseIterator_i.cxx \ - SALOMEDS_ChildIterator_i.cxx \ - SALOMEDS_SComponentIterator_i.cxx \ - SALOMEDS_Study_i.cxx \ - SALOMEDS_StudyBuilder_i.cxx \ - SALOMEDS_SObject_i.cxx \ - SALOMEDS_SComponent_i.cxx \ - SALOMEDS_GenericAttribute_i.cxx \ - SALOMEDS_AttributeComment_i.cxx \ - SALOMEDS_AttributeExternalFileDef_i.cxx \ - SALOMEDS_AttributeFileType_i.cxx \ - SALOMEDS_AttributeIOR_i.cxx \ - SALOMEDS_AttributeInteger_i.cxx \ - SALOMEDS_AttributeName_i.cxx \ - SALOMEDS_AttributePersistentRef_i.cxx \ - SALOMEDS_AttributeReal_i.cxx \ - SALOMEDS_AttributeSequenceOfReal_i.cxx \ - SALOMEDS_AttributeSequenceOfInteger_i.cxx \ - SALOMEDS_AttributeDrawable_i.cxx \ - SALOMEDS_AttributeSelectable_i.cxx \ - SALOMEDS_AttributeOpened_i.cxx \ - SALOMEDS_AttributeFlags_i.cxx \ - SALOMEDS_AttributeGraphic_i.cxx \ - SALOMEDS_AttributeExpandable_i.cxx \ - SALOMEDS_AttributeTextColor_i.cxx \ - SALOMEDS_AttributeTextHighlightColor_i.cxx \ - SALOMEDS_AttributePixMap_i.cxx \ - SALOMEDS_AttributeTreeNode_i.cxx \ - SALOMEDS_AttributeLocalID_i.cxx \ - SALOMEDS_AttributeUserID_i.cxx \ - SALOMEDS_AttributeTarget_i.cxx \ - SALOMEDS_AttributeTableOfInteger_i.cxx \ - SALOMEDS_AttributeTableOfReal_i.cxx \ - SALOMEDS_AttributeTableOfString_i.cxx \ - SALOMEDS_AttributeStudyProperties_i.cxx \ - SALOMEDS_AttributePythonObject_i.cxx \ - SALOMEDS_SObject.cxx \ - SALOMEDS_SComponent.cxx \ - SALOMEDS_GenericAttribute.cxx \ - SALOMEDS_ChildIterator.cxx \ - SALOMEDS_SComponentIterator.cxx \ - SALOMEDS_UseCaseIterator.cxx \ - SALOMEDS_UseCaseBuilder.cxx \ - SALOMEDS_StudyBuilder.cxx \ - SALOMEDS_Study.cxx \ - SALOMEDS_StudyManager.cxx \ - SALOMEDS_AttributeStudyProperties.cxx \ - SALOMEDS_AttributeComment.cxx \ - SALOMEDS_AttributeDrawable.cxx \ - SALOMEDS_AttributeExpandable.cxx \ - SALOMEDS_AttributeExternalFileDef.cxx \ - SALOMEDS_AttributeFileType.cxx \ - SALOMEDS_AttributeFlags.cxx \ - SALOMEDS_AttributeGraphic.cxx \ - SALOMEDS_AttributeIOR.cxx \ - SALOMEDS_AttributeInteger.cxx \ - SALOMEDS_AttributeLocalID.cxx \ - SALOMEDS_AttributeName.cxx \ - SALOMEDS_AttributeOpened.cxx \ - SALOMEDS_AttributePythonObject.cxx \ - SALOMEDS_AttributeReal.cxx \ - SALOMEDS_AttributeSelectable.cxx \ - SALOMEDS_AttributeSequenceOfInteger.cxx \ - SALOMEDS_AttributePersistentRef.cxx \ - SALOMEDS_AttributePixMap.cxx \ - SALOMEDS_AttributeSequenceOfReal.cxx \ - SALOMEDS_AttributeTableOfInteger.cxx \ - SALOMEDS_AttributeTableOfReal.cxx \ - SALOMEDS_AttributeTableOfString.cxx \ - SALOMEDS_AttributeTarget.cxx \ - SALOMEDS_AttributeTextColor.cxx \ - SALOMEDS_AttributeTextHighlightColor.cxx \ - SALOMEDS_AttributeTreeNode.cxx \ - SALOMEDS_AttributeUserID.cxx \ - $(BUILT_SOURCES) + SALOMEDS.cxx \ + SALOMEDS_Driver_i.cxx \ + SALOMEDS_StudyManager_i.cxx \ + SALOMEDS_UseCaseBuilder_i.cxx \ + SALOMEDS_UseCaseIterator_i.cxx \ + SALOMEDS_ChildIterator_i.cxx \ + SALOMEDS_SComponentIterator_i.cxx \ + SALOMEDS_Study_i.cxx \ + SALOMEDS_StudyBuilder_i.cxx \ + SALOMEDS_SObject_i.cxx \ + SALOMEDS_SComponent_i.cxx \ + SALOMEDS_GenericAttribute_i.cxx \ + SALOMEDS_AttributeComment_i.cxx \ + SALOMEDS_AttributeExternalFileDef_i.cxx \ + SALOMEDS_AttributeFileType_i.cxx \ + SALOMEDS_AttributeIOR_i.cxx \ + SALOMEDS_AttributeInteger_i.cxx \ + SALOMEDS_AttributeName_i.cxx \ + SALOMEDS_AttributePersistentRef_i.cxx \ + SALOMEDS_AttributeReal_i.cxx \ + SALOMEDS_AttributeSequenceOfReal_i.cxx \ + SALOMEDS_AttributeSequenceOfInteger_i.cxx \ + SALOMEDS_AttributeDrawable_i.cxx \ + SALOMEDS_AttributeSelectable_i.cxx \ + SALOMEDS_AttributeOpened_i.cxx \ + SALOMEDS_AttributeFlags_i.cxx \ + SALOMEDS_AttributeGraphic_i.cxx \ + SALOMEDS_AttributeExpandable_i.cxx \ + SALOMEDS_AttributeTextColor_i.cxx \ + SALOMEDS_AttributeTextHighlightColor_i.cxx \ + SALOMEDS_AttributePixMap_i.cxx \ + SALOMEDS_AttributeTreeNode_i.cxx \ + SALOMEDS_AttributeLocalID_i.cxx \ + SALOMEDS_AttributeUserID_i.cxx \ + SALOMEDS_AttributeTarget_i.cxx \ + SALOMEDS_AttributeTableOfInteger_i.cxx \ + SALOMEDS_AttributeTableOfReal_i.cxx \ + SALOMEDS_AttributeTableOfString_i.cxx \ + SALOMEDS_AttributeStudyProperties_i.cxx \ + SALOMEDS_AttributePythonObject_i.cxx \ + SALOMEDS_SObject.cxx \ + SALOMEDS_SComponent.cxx \ + SALOMEDS_GenericAttribute.cxx \ + SALOMEDS_ChildIterator.cxx \ + SALOMEDS_SComponentIterator.cxx \ + SALOMEDS_UseCaseIterator.cxx \ + SALOMEDS_UseCaseBuilder.cxx \ + SALOMEDS_StudyBuilder.cxx \ + SALOMEDS_Study.cxx \ + SALOMEDS_StudyManager.cxx \ + SALOMEDS_AttributeStudyProperties.cxx \ + SALOMEDS_AttributeComment.cxx \ + SALOMEDS_AttributeDrawable.cxx \ + SALOMEDS_AttributeExpandable.cxx \ + SALOMEDS_AttributeExternalFileDef.cxx \ + SALOMEDS_AttributeFileType.cxx \ + SALOMEDS_AttributeFlags.cxx \ + SALOMEDS_AttributeGraphic.cxx \ + SALOMEDS_AttributeIOR.cxx \ + SALOMEDS_AttributeInteger.cxx \ + SALOMEDS_AttributeLocalID.cxx \ + SALOMEDS_AttributeName.cxx \ + SALOMEDS_AttributeOpened.cxx \ + SALOMEDS_AttributePythonObject.cxx \ + SALOMEDS_AttributeReal.cxx \ + SALOMEDS_AttributeSelectable.cxx \ + SALOMEDS_AttributeSequenceOfInteger.cxx \ + SALOMEDS_AttributePersistentRef.cxx \ + SALOMEDS_AttributePixMap.cxx \ + SALOMEDS_AttributeSequenceOfReal.cxx \ + SALOMEDS_AttributeTableOfInteger.cxx \ + SALOMEDS_AttributeTableOfReal.cxx \ + SALOMEDS_AttributeTableOfString.cxx \ + SALOMEDS_AttributeTarget.cxx \ + SALOMEDS_AttributeTextColor.cxx \ + SALOMEDS_AttributeTextHighlightColor.cxx \ + SALOMEDS_AttributeTreeNode.cxx \ + SALOMEDS_AttributeUserID.cxx \ + \ + Handle_SALOMEDS_DataMapNodeOfDataMapOfIntegerString.hxx \ + Handle_SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx \ + Handle_SALOMEDS_DrawableAttribute.hxx \ + Handle_SALOMEDS_ExpandableAttribute.hxx \ + Handle_SALOMEDS_ExternalFileDef.hxx \ + Handle_SALOMEDS_FileType.hxx \ + Handle_SALOMEDS_IORAttribute.hxx \ + Handle_SALOMEDS_LocalIDAttribute.hxx \ + Handle_SALOMEDS_OCAFApplication.hxx \ + Handle_SALOMEDS_OpenedAttribute.hxx \ + Handle_SALOMEDS_PersRefAttribute.hxx \ + Handle_SALOMEDS_PixMapAttribute.hxx \ + Handle_SALOMEDS_PythonObjectAttribute.hxx \ + Handle_SALOMEDS_SelectableAttribute.hxx \ + Handle_SALOMEDS_SequenceOfIntegerAttribute.hxx \ + Handle_SALOMEDS_SequenceOfRealAttribute.hxx \ + Handle_SALOMEDS_StudyPropertiesAttribute.hxx \ + Handle_SALOMEDS_TableOfIntegerAttribute.hxx \ + Handle_SALOMEDS_TableOfRealAttribute.hxx \ + Handle_SALOMEDS_TableOfStringAttribute.hxx \ + Handle_SALOMEDS_TargetAttribute.hxx \ + Handle_SALOMEDS_TextColorAttribute.hxx \ + Handle_SALOMEDS_TextHighlightColorAttribute.hxx \ + SALOMEDS_AttLong_i.hxx \ + SALOMEDS_AttReal_i.hxx \ + SALOMEDS_AttributeComment.hxx \ + SALOMEDS_AttributeComment_i.hxx \ + SALOMEDS_AttributeDrawable.hxx \ + SALOMEDS_AttributeDrawable_i.hxx \ + SALOMEDS_AttributeExpandable.hxx \ + SALOMEDS_AttributeExpandable_i.hxx \ + SALOMEDS_AttributeExternalFileDef.hxx \ + SALOMEDS_AttributeExternalFileDef_i.hxx \ + SALOMEDS_AttributeFileType.hxx \ + SALOMEDS_AttributeFileType_i.hxx \ + SALOMEDS_AttributeFlags.hxx \ + SALOMEDS_AttributeFlags_i.hxx \ + SALOMEDS_AttributeGraphic.hxx \ + SALOMEDS_AttributeGraphic_i.hxx \ + SALOMEDS_AttributeInteger.hxx \ + SALOMEDS_AttributeInteger_i.hxx \ + SALOMEDS_AttributeIOR.hxx \ + SALOMEDS_AttributeIOR_i.hxx \ + SALOMEDS_AttributeLocalID.hxx \ + SALOMEDS_AttributeLocalID_i.hxx \ + SALOMEDS_AttributeName.hxx \ + SALOMEDS_AttributeName_i.hxx \ + SALOMEDS_AttributeOpened.hxx \ + SALOMEDS_AttributeOpened_i.hxx \ + SALOMEDS_AttributePersistentRef.hxx \ + SALOMEDS_AttributePersistentRef_i.hxx \ + SALOMEDS_AttributePixMap.hxx \ + SALOMEDS_AttributePixMap_i.hxx \ + SALOMEDS_AttributePythonObject.hxx \ + SALOMEDS_AttributePythonObject_i.hxx \ + SALOMEDS_AttributeReal.hxx \ + SALOMEDS_AttributeReal_i.hxx \ + SALOMEDS_AttributeSelectable.hxx \ + SALOMEDS_AttributeSelectable_i.hxx \ + SALOMEDS_AttributeSequenceOfInteger.hxx \ + SALOMEDS_AttributeSequenceOfInteger_i.hxx \ + SALOMEDS_AttributeSequenceOfReal.hxx \ + SALOMEDS_AttributeSequenceOfReal_i.hxx \ + SALOMEDS_Attributes.hxx \ + SALOMEDS_AttributeStudyProperties.hxx \ + SALOMEDS_AttributeStudyProperties_i.hxx \ + SALOMEDS_AttributeTableOfInteger.hxx \ + SALOMEDS_AttributeTableOfInteger_i.hxx \ + SALOMEDS_AttributeTableOfReal.hxx \ + SALOMEDS_AttributeTableOfReal_i.hxx \ + SALOMEDS_AttributeTableOfString.hxx \ + SALOMEDS_AttributeTableOfString_i.hxx \ + SALOMEDS_AttributeTarget.hxx \ + SALOMEDS_AttributeTarget_i.hxx \ + SALOMEDS_AttributeTextColor.hxx \ + SALOMEDS_AttributeTextColor_i.hxx \ + SALOMEDS_AttributeTextHighlightColor.hxx \ + SALOMEDS_AttributeTextHighlightColor_i.hxx \ + SALOMEDS_AttributeTreeNode.hxx \ + SALOMEDS_AttributeTreeNode_i.hxx \ + SALOMEDS_AttributeUserID.hxx \ + SALOMEDS_AttributeUserID_i.hxx \ + SALOMEDS_BasicAttributeFactory.hxx \ + SALOMEDS_BasicAttribute_i.hxx \ + SALOMEDS_Callback_i.hxx \ + SALOMEDS_ChildIterator.hxx \ + SALOMEDS_ChildIterator_i.hxx \ + SALOMEDS_ClientAttributes.hxx \ + SALOMEDS_DataMapIteratorOfDataMapOfIntegerString.hxx \ + SALOMEDS_DataMapIteratorOfDataMapStringLabel.hxx \ + SALOMEDS_DataMapNodeOfDataMapOfIntegerString.hxx \ + SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx \ + SALOMEDS_DataMapOfIntegerString.hxx \ + SALOMEDS_DataMapStringLabel.hxx \ + SALOMEDS_DrawableAttribute.hxx \ + SALOMEDS_Driver_i.hxx \ + SALOMEDS_ExpandableAttribute.hxx \ + SALOMEDS_ExternalFileDef.hxx \ + SALOMEDS_FileType.hxx \ + SALOMEDS_FlagsAttribute.hxx \ + SALOMEDS_GenericAttribute.hxx \ + SALOMEDS_GenericAttribute_i.hxx \ + SALOMEDS_GraphicAttribute.hxx \ + SALOMEDS.hxx \ + SALOMEDS_IORAttribute.hxx \ + SALOMEDS_LocalIDAttribute.hxx \ + SALOMEDS_OCAFApplication.hxx \ + SALOMEDS_OpenedAttribute.hxx \ + SALOMEDS_PersRefAttribute.hxx \ + SALOMEDS_PixMapAttribute.hxx \ + SALOMEDS_PythonObjectAttribute.hxx \ + SALOMEDS_SAttribute_i.hxx \ + SALOMEDS_SComponent.hxx \ + SALOMEDS_SComponent_i.hxx \ + SALOMEDS_SComponentIterator.hxx \ + SALOMEDS_SComponentIterator_i.hxx \ + SALOMEDS_SelectableAttribute.hxx \ + SALOMEDS_SequenceOfIntegerAttribute.hxx \ + SALOMEDS_SequenceOfRealAttribute.hxx \ + SALOMEDS_SObject.hxx \ + SALOMEDS_SObject_i.hxx \ + SALOMEDS_StudyBuilder.hxx \ + SALOMEDS_StudyBuilder_i.hxx \ + SALOMEDS_Study.hxx \ + SALOMEDS_Study_i.hxx \ + SALOMEDS_StudyManager.hxx \ + SALOMEDS_StudyManager_i.hxx \ + SALOMEDS_StudyPropertiesAttribute.hxx \ + SALOMEDS_TableOfIntegerAttribute.hxx \ + SALOMEDS_TableOfRealAttribute.hxx \ + SALOMEDS_TableOfStringAttribute.hxx \ + SALOMEDS_TargetAttribute.hxx \ + SALOMEDS_TextColorAttribute.hxx \ + SALOMEDS_TextHighlightColorAttribute.hxx \ + SALOMEDS_UseCaseBuilder.hxx \ + SALOMEDS_UseCaseBuilder_i.hxx \ + SALOMEDS_UseCaseIterator.hxx \ + SALOMEDS_UseCaseIterator_i.hxx \ + $(IDL_SOURCES) libSalomeDS_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSalomeDS_la_LDFLAGS = -no-undefined -version-info=0:0:0 diff --git a/src/SALOMEDSImpl/Makefile.am b/src/SALOMEDSImpl/Makefile.am index 8a0f9b30d..1600013c5 100644 --- a/src/SALOMEDSImpl/Makefile.am +++ b/src/SALOMEDSImpl/Makefile.am @@ -86,50 +86,97 @@ COMMON_LIBS =\ # lib_LTLIBRARIES = libSalomeDSImpl.la libSalomeDSImpl_la_SOURCES =\ - SALOMEDSImpl_Tool.cxx \ - SALOMEDSImpl_Callback.cxx \ - SALOMEDSImpl_StudyHandle.cxx \ - SALOMEDSImpl_GenericAttribute.cxx \ - SALOMEDSImpl_SObject.cxx \ - SALOMEDSImpl_SComponent.cxx \ - SALOMEDSImpl_ChildIterator.cxx \ - SALOMEDSImpl_OCAFApplication.cxx \ - SALOMEDSImpl_AttributeIOR.cxx \ - SALOMEDSImpl_AttributeExternalFileDef.cxx \ - SALOMEDSImpl_AttributeFileType.cxx \ - SALOMEDSImpl_AttributePersistentRef.cxx \ - SALOMEDSImpl_AttributeSequenceOfReal.cxx \ - SALOMEDSImpl_AttributeSequenceOfInteger.cxx \ - SALOMEDSImpl_AttributeDrawable.cxx \ - SALOMEDSImpl_AttributeSelectable.cxx \ - SALOMEDSImpl_AttributeExpandable.cxx \ - SALOMEDSImpl_AttributeOpened.cxx \ - SALOMEDSImpl_AttributeFlags.cxx \ - SALOMEDSImpl_AttributeGraphic.cxx \ - SALOMEDSImpl_AttributeTextColor.cxx \ - SALOMEDSImpl_AttributeTextHighlightColor.cxx \ - SALOMEDSImpl_AttributePixMap.cxx \ - SALOMEDSImpl_AttributeLocalID.cxx \ - SALOMEDSImpl_AttributeTarget.cxx \ - SALOMEDSImpl_AttributeTableOfInteger.cxx \ - SALOMEDSImpl_AttributeTableOfReal.cxx \ - SALOMEDSImpl_AttributeTableOfString.cxx \ - SALOMEDSImpl_AttributeStudyProperties.cxx \ - SALOMEDSImpl_AttributePythonObject.cxx \ - SALOMEDSImpl_AttributeReal.cxx \ - SALOMEDSImpl_AttributeInteger.cxx \ - SALOMEDSImpl_AttributeUserID.cxx \ - SALOMEDSImpl_AttributeTreeNode.cxx \ - SALOMEDSImpl_AttributeName.cxx \ - SALOMEDSImpl_AttributeComment.cxx \ - SALOMEDSImpl_AttributeReference.cxx \ - SALOMEDSImpl_ChildNodeIterator.cxx \ - SALOMEDSImpl_UseCaseBuilder.cxx \ - SALOMEDSImpl_UseCaseIterator.cxx \ - SALOMEDSImpl_SComponentIterator.cxx \ - SALOMEDSImpl_StudyBuilder.cxx \ - SALOMEDSImpl_Study.cxx \ - SALOMEDSImpl_StudyManager.cxx + SALOMEDSImpl_Tool.cxx \ + SALOMEDSImpl_Callback.cxx \ + SALOMEDSImpl_StudyHandle.cxx \ + SALOMEDSImpl_GenericAttribute.cxx \ + SALOMEDSImpl_SObject.cxx \ + SALOMEDSImpl_SComponent.cxx \ + SALOMEDSImpl_ChildIterator.cxx \ + SALOMEDSImpl_OCAFApplication.cxx \ + SALOMEDSImpl_AttributeIOR.cxx \ + SALOMEDSImpl_AttributeExternalFileDef.cxx \ + SALOMEDSImpl_AttributeFileType.cxx \ + SALOMEDSImpl_AttributePersistentRef.cxx \ + SALOMEDSImpl_AttributeSequenceOfReal.cxx \ + SALOMEDSImpl_AttributeSequenceOfInteger.cxx \ + SALOMEDSImpl_AttributeDrawable.cxx \ + SALOMEDSImpl_AttributeSelectable.cxx \ + SALOMEDSImpl_AttributeExpandable.cxx \ + SALOMEDSImpl_AttributeOpened.cxx \ + SALOMEDSImpl_AttributeFlags.cxx \ + SALOMEDSImpl_AttributeGraphic.cxx \ + SALOMEDSImpl_AttributeTextColor.cxx \ + SALOMEDSImpl_AttributeTextHighlightColor.cxx \ + SALOMEDSImpl_AttributePixMap.cxx \ + SALOMEDSImpl_AttributeLocalID.cxx \ + SALOMEDSImpl_AttributeTarget.cxx \ + SALOMEDSImpl_AttributeTableOfInteger.cxx \ + SALOMEDSImpl_AttributeTableOfReal.cxx \ + SALOMEDSImpl_AttributeTableOfString.cxx \ + SALOMEDSImpl_AttributeStudyProperties.cxx \ + SALOMEDSImpl_AttributePythonObject.cxx \ + SALOMEDSImpl_AttributeReal.cxx \ + SALOMEDSImpl_AttributeInteger.cxx \ + SALOMEDSImpl_AttributeUserID.cxx \ + SALOMEDSImpl_AttributeTreeNode.cxx \ + SALOMEDSImpl_AttributeName.cxx \ + SALOMEDSImpl_AttributeComment.cxx \ + SALOMEDSImpl_AttributeReference.cxx \ + SALOMEDSImpl_ChildNodeIterator.cxx \ + SALOMEDSImpl_UseCaseBuilder.cxx \ + SALOMEDSImpl_UseCaseIterator.cxx \ + SALOMEDSImpl_SComponentIterator.cxx \ + SALOMEDSImpl_StudyBuilder.cxx \ + SALOMEDSImpl_Study.cxx \ + SALOMEDSImpl_StudyManager.cxx \ + \ + SALOMEDSImpl_AttributeComment.hxx \ + SALOMEDSImpl_AttributeDrawable.hxx \ + SALOMEDSImpl_AttributeExpandable.hxx \ + SALOMEDSImpl_AttributeExternalFileDef.hxx \ + SALOMEDSImpl_AttributeFileType.hxx \ + SALOMEDSImpl_AttributeFlags.hxx \ + SALOMEDSImpl_AttributeGraphic.hxx \ + SALOMEDSImpl_AttributeInteger.hxx \ + SALOMEDSImpl_AttributeIOR.hxx \ + SALOMEDSImpl_AttributeLocalID.hxx \ + SALOMEDSImpl_AttributeName.hxx \ + SALOMEDSImpl_AttributeOpened.hxx \ + SALOMEDSImpl_AttributePersistentRef.hxx \ + SALOMEDSImpl_AttributePixMap.hxx \ + SALOMEDSImpl_AttributePythonObject.hxx \ + SALOMEDSImpl_AttributeReal.hxx \ + SALOMEDSImpl_AttributeReference.hxx \ + SALOMEDSImpl_AttributeSelectable.hxx \ + SALOMEDSImpl_AttributeSequenceOfInteger.hxx \ + SALOMEDSImpl_AttributeSequenceOfReal.hxx \ + SALOMEDSImpl_Attributes.hxx \ + SALOMEDSImpl_AttributeStudyProperties.hxx \ + SALOMEDSImpl_AttributeTableOfInteger.hxx \ + SALOMEDSImpl_AttributeTableOfReal.hxx \ + SALOMEDSImpl_AttributeTableOfString.hxx \ + SALOMEDSImpl_AttributeTarget.hxx \ + SALOMEDSImpl_AttributeTextColor.hxx \ + SALOMEDSImpl_AttributeTextHighlightColor.hxx \ + SALOMEDSImpl_AttributeTreeNode.hxx \ + SALOMEDSImpl_AttributeUserID.hxx \ + SALOMEDSImpl_Callback.hxx \ + SALOMEDSImpl_ChildIterator.hxx \ + SALOMEDSImpl_ChildNodeIterator.hxx \ + SALOMEDSImpl_Driver.hxx \ + SALOMEDSImpl_GenericAttribute.hxx \ + SALOMEDSImpl_OCAFApplication.hxx \ + SALOMEDSImpl_SComponent.hxx \ + SALOMEDSImpl_SComponentIterator.hxx \ + SALOMEDSImpl_SObject.hxx \ + SALOMEDSImpl_StudyBuilder.hxx \ + SALOMEDSImpl_StudyHandle.hxx \ + SALOMEDSImpl_Study.hxx \ + SALOMEDSImpl_StudyManager.hxx \ + SALOMEDSImpl_Tool.hxx \ + SALOMEDSImpl_UseCaseBuilder.hxx \ + SALOMEDSImpl_UseCaseIterator.hxx libSalomeDSImpl_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSalomeDSImpl_la_LDFLAGS = -no-undefined -version-info=0:0:0 diff --git a/src/SALOMELocalTrace/Makefile.am b/src/SALOMELocalTrace/Makefile.am index b6c9a7e02..f9cec5a2b 100644 --- a/src/SALOMELocalTrace/Makefile.am +++ b/src/SALOMELocalTrace/Makefile.am @@ -28,15 +28,23 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am -salomeinclude_HEADERS = utilities.h \ - LocalTraceBufferPool.hxx \ - BaseTraceCollector.hxx +salomeinclude_HEADERS = \ + utilities.h \ + LocalTraceBufferPool.hxx \ + BaseTraceCollector.hxx + +lib_LTLIBRARIES = libSALOMELocalTrace.la + +libSALOMELocalTrace_la_SOURCES = \ + BaseTraceCollector.cxx \ + BaseTraceCollector.hxx \ + LocalTraceCollector.cxx \ + LocalTraceCollector.hxx \ + FileTraceCollector.cxx \ + FileTraceCollector.hxx \ + LocalTraceBufferPool.cxx \ + LocalTraceBufferPool.hxx -lib_LTLIBRARIES = libSALOMELocalTrace.la -libSALOMELocalTrace_la_SOURCES = BaseTraceCollector.cxx BaseTraceCollector.hxx \ - LocalTraceCollector.cxx \ - FileTraceCollector.cxx \ - LocalTraceBufferPool.cxx LocalTraceBufferPool.hxx libSALOMELocalTrace_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSALOMELocalTrace_la_CPPFLAGS = -I$(srcdir)/../Basics libSALOMELocalTrace_la_LIBADD = ../Basics/libSALOMEBasics.la diff --git a/src/SALOMELocalTrace/Test/Makefile.am b/src/SALOMELocalTrace/Test/Makefile.am index 186cf18a2..3dd30e3d9 100644 --- a/src/SALOMELocalTrace/Test/Makefile.am +++ b/src/SALOMELocalTrace/Test/Makefile.am @@ -41,7 +41,7 @@ SRCROOT=$(srcdir)/../.. salomeinclude_HEADERS = SALOMELocalTraceTest.hxx # Executable scripts to be installed -salomescript_SCRIPTS = TestSALOMELocalTrace.py +dist_salomescript_SCRIPTS = TestSALOMELocalTrace.py # # =============================================================== diff --git a/src/SALOMETraceCollector/Makefile.am b/src/SALOMETraceCollector/Makefile.am index 74ab9ac63..928901b8e 100644 --- a/src/SALOMETraceCollector/Makefile.am +++ b/src/SALOMETraceCollector/Makefile.am @@ -14,9 +14,17 @@ salomeinclude_HEADERS = \ SALOMETraceCollector.hxx \ TraceCollector_WaitForServerReadiness.hxx -# The BUILT_SOURCES defines the list of files generated from the idl +# The IDL_SOURCES defines the list of files generated from the idl # interface (Logger.idl in this case). -BUILT_SOURCES = $(top_builddir)/idl/Logger.hh $(top_builddir)/idl/LoggerSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/Logger.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/LoggerSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # Libraries targets lib_LTLIBRARIES = libwith_loggerTraceCollector.la @@ -24,7 +32,7 @@ lib_LTLIBRARIES = libwith_loggerTraceCollector.la libwith_loggerTraceCollector_la_SOURCES =\ SALOMETraceCollector.cxx \ TraceCollector_WaitForServerReadiness.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libwith_loggerTraceCollector_la_CPPFLAGS =\ -I$(srcdir)/../Basics \ diff --git a/src/SALOMETraceCollector/Test/Makefile.am b/src/SALOMETraceCollector/Test/Makefile.am index 8e90bb7b4..dd715ebf3 100644 --- a/src/SALOMETraceCollector/Test/Makefile.am +++ b/src/SALOMETraceCollector/Test/Makefile.am @@ -40,7 +40,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am salomeinclude_HEADERS= SALOMETraceCollectorTest.hxx # Scripts to be installed -salomescript_SCRIPTS = TestSALOMETraceCollector.py +dist_salomescript_SCRIPTS = TestSALOMETraceCollector.py # diff --git a/src/TOOLSDS/Makefile.am b/src/TOOLSDS/Makefile.am index c32394078..552de892d 100644 --- a/src/TOOLSDS/Makefile.am +++ b/src/TOOLSDS/Makefile.am @@ -13,14 +13,23 @@ salomeinclude_HEADERS = SALOMEDS_Tool.hxx # Local definitions # =============================================================== # -LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl SALOME_GenericObj.idl # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOMEDS.hh $(top_builddir)/idl/SALOMEDSSK.cc \ - $(top_builddir)/idl/SALOMEDS_Attributes.hh $(top_builddir)/idl/SALOMEDS_AttributesSK.cc \ - $(top_builddir)/idl/SALOME_GenericObj.hh $(top_builddir)/idl/SALOME_GenericObjSK.cc \ - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOMEDS.hh \ + $(top_builddir)/idl/SALOMEDS_Attributes.hh \ + $(top_builddir)/idl/SALOME_GenericObj.hh \ + $(top_builddir)/idl/SALOME_Exception.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOMEDSSK.cc \ + $(top_builddir)/idl/SALOMEDS_AttributesSK.cc \ + $(top_builddir)/idl/SALOME_GenericObjSK.cc \ + $(top_builddir)/idl/SALOME_ExceptionSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @@ -47,7 +56,7 @@ COMMON_LIBS =\ lib_LTLIBRARIES = libTOOLSDS.la libTOOLSDS_la_SOURCES = \ SALOMEDS_Tool.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libTOOLSDS_la_CPPFLAGS = $(COMMON_CPPFLAGS) libTOOLSDS_la_LDFLAGS = -no-undefined -version-info=0:0:0 diff --git a/src/TestContainer/Makefile.am b/src/TestContainer/Makefile.am index 6ad0c10ea..a996bca49 100644 --- a/src/TestContainer/Makefile.am +++ b/src/TestContainer/Makefile.am @@ -36,7 +36,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # # header files # Scripts to be installed -salomescript_DATA = SALOME_TestComponentPy.py TestComponentPy.py +dist_salomescript_DATA = SALOME_TestComponentPy.py TestComponentPy.py # # =============================================================== @@ -71,10 +71,19 @@ COMMON_LIBS =\ ../Basics/libSALOMEBasics.la # Sources built from idl files and required for building -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_TestComponent.hh $(top_builddir)/idl/SALOME_TestComponentSK.cc \ - $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_TestComponent.hh \ + $(top_builddir)/idl/SALOME_Component.hh \ + $(top_builddir)/idl/SALOME_Exception.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_TestComponentSK.cc \ + $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_ExceptionSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # # =============================================================== @@ -82,7 +91,10 @@ BUILT_SOURCES =\ # =============================================================== # lib_LTLIBRARIES = libSalomeTestComponentEngine.la -libSalomeTestComponentEngine_la_SOURCES = SALOME_TestComponent_i.cxx $(BUILT_SOURCES) +libSalomeTestComponentEngine_la_SOURCES = \ + SALOME_TestComponent_i.cxx \ + SALOME_TestComponent_i.hxx \ + $(IDL_SOURCES) libSalomeTestComponentEngine_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSalomeTestComponentEngine_la_LIBADD = $(COMMON_LIBS) diff --git a/src/TestMPIContainer/Makefile.am b/src/TestMPIContainer/Makefile.am index a054071ec..dca3c40b0 100644 --- a/src/TestMPIContainer/Makefile.am +++ b/src/TestMPIContainer/Makefile.am @@ -51,10 +51,19 @@ salomeinclude_HEADERS = TestMPIComponentEngine.hxx # =============================================================== # # Sources built from idl files -BUILT_SOURCES =\ - $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_MPIObject.hh $(top_builddir)/idl/SALOME_MPIObjectSK.cc \ - $(top_builddir)/idl/SALOME_TestMPIComponent.hh $(top_builddir)/idl/SALOME_TestMPIComponentSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_Component.hh \ + $(top_builddir)/idl/SALOME_MPIObject.hh \ + $(top_builddir)/idl/SALOME_TestMPIComponent.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_MPIObjectSK.cc \ + $(top_builddir)/idl/SALOME_TestMPIComponentSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # This local variable defines the list of CPPFLAGS common to all target in this package. @@ -93,7 +102,7 @@ COMMON_LIBS =\ # =============================================================== # lib_LTLIBRARIES = libSalomeTestMPIComponentEngine.la -libSalomeTestMPIComponentEngine_la_SOURCES = TestMPIComponentEngine.cxx $(BUILT_SOURCES) +libSalomeTestMPIComponentEngine_la_SOURCES = TestMPIComponentEngine.cxx $(IDL_SOURCES) libSalomeTestMPIComponentEngine_la_CPPFLAGS = $(COMMON_CPPFLAGS) libSalomeTestMPIComponentEngine_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeTestMPIComponentEngine_la_LIBADD = $(COMMON_LIBS) diff --git a/src/UnitTests/Makefile.am b/src/UnitTests/Makefile.am index 22a1a939e..de5fbefa2 100644 --- a/src/UnitTests/Makefile.am +++ b/src/UnitTests/Makefile.am @@ -35,7 +35,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # # Executable scripts to be installed -salomescript_SCRIPTS = UnitTests.py +dist_salomescript_SCRIPTS = UnitTests.py # # =============================================================== @@ -43,14 +43,24 @@ salomescript_SCRIPTS = UnitTests.py # =============================================================== # -BUILT_SOURCES = \ - $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ - $(top_builddir)/idl/SALOME_TestComponent.hh $(top_builddir)/idl/SALOME_TestComponentSK.cc \ - $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc \ - $(top_builddir)/idl/nstest.hh $(top_builddir)/idl/nstestSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_Component.hh \ + $(top_builddir)/idl/SALOME_TestComponent.hh \ + $(top_builddir)/idl/SALOME_Exception.hh \ + $(top_builddir)/idl/nstest.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_TestComponentSK.cc \ + $(top_builddir)/idl/SALOME_ExceptionSK.cc \ + $(top_builddir)/idl/nstestSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) bin_PROGRAMS = UnitTests -UnitTests_SOURCES = UnitTests.cxx $(BUILT_SOURCES) +UnitTests_SOURCES = UnitTests.cxx $(IDL_SOURCES) UnitTests_CPPFLAGS =\ @CPPUNIT_INCLUDES@ \ -I$(srcdir)/../Basics -I$(srcdir)/../Basics/Test \ diff --git a/src/Utils/Makefile.am b/src/Utils/Makefile.am index 077b2bcf2..68cd76c67 100644 --- a/src/Utils/Makefile.am +++ b/src/Utils/Makefile.am @@ -45,13 +45,21 @@ salomeinclude_HEADERS =\ Utils_Mutex.hxx # Scripts to be exported -salomescript_DATA =\ +dist_salomescript_DATA =\ Utils_Identity.py \ SALOME_utilities.py -# The BUILT_SOURCES defines the list of files generated from the idl +# The IDL_SOURCES defines the list of files generated from the idl # interface (SALOME_Exception.idl in this case). -BUILT_SOURCES = $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc +nodist_include_HEADERS = \ + $(top_builddir)/idl/SALOME_Exception.hh + +nodist_prog_SOURCES = \ + $(top_builddir)/idl/SALOME_ExceptionSK.cc + +IDL_SOURCES = \ + $(nodist_include_HEADERS) \ + $(nodist_prog_SOURCES) # Libraries targets lib_LTLIBRARIES = libOpUtil.la @@ -64,7 +72,7 @@ libOpUtil_la_SOURCES =\ Utils_ExceptHandlers.cxx \ Utils_SignalsHandler.cxx \ Utils_Mutex.cxx \ - $(BUILT_SOURCES) + $(IDL_SOURCES) libOpUtil_la_LDFLAGS = -no-undefined -version-info=0:0:0 diff --git a/src/Utils/Test/Makefile.am b/src/Utils/Test/Makefile.am index f942322cb..5ef20d823 100644 --- a/src/Utils/Test/Makefile.am +++ b/src/Utils/Test/Makefile.am @@ -38,7 +38,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am salomeinclude_HEADERS= UtilsTest.hxx # Scripts to be installed -salomescript_SCRIPTS = TestUtils.py +dist_salomescript_SCRIPTS = TestUtils.py # -- 2.39.2