]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
PR: conditionnal compilation and make dist
authorprascle <prascle>
Tue, 14 Feb 2006 19:15:57 +0000 (19:15 +0000)
committerprascle <prascle>
Tue, 14 Feb 2006 19:15:57 +0000 (19:15 +0000)
38 files changed:
Makefile.am
bin/Makefile.am
doc/Makefile.in
idl/Makefile.am
resources/Makefile.am
salome_adm/unix/Makefile.am
src/Basics/Makefile.am
src/Batch_SWIG/Makefile.am
src/Communication/Makefile.am
src/Container/Makefile.am
src/DataTypeCatalog/Makefile.am
src/GenericObj/Makefile.am
src/LifeCycleCORBA/Makefile.am
src/LifeCycleCORBA/Test/Makefile.am
src/LifeCycleCORBA_SWIG/Makefile.am
src/Logger/Makefile.am
src/Logger/Test/Makefile.am
src/MPIContainer/Makefile.am
src/Makefile.am
src/ModuleCatalog/Makefile.am
src/ModuleGenerator/Makefile.am
src/NamingService/Makefile.am
src/NamingService/Test/Makefile.am
src/Registry/Makefile.am
src/ResourcesManager/Makefile.am
src/RessourcesCatalog/Makefile.am
src/SALOMEDS/Makefile.am
src/SALOMEDSImpl/Makefile.am
src/SALOMELocalTrace/Makefile.am
src/SALOMELocalTrace/Test/Makefile.am
src/SALOMETraceCollector/Makefile.am
src/SALOMETraceCollector/Test/Makefile.am
src/TOOLSDS/Makefile.am
src/TestContainer/Makefile.am
src/TestMPIContainer/Makefile.am
src/UnitTests/Makefile.am
src/Utils/Makefile.am
src/Utils/Test/Makefile.am

index fe33b60abfdcd5477b8f587d40c9b1ca9d422bde..e8bf882a3bd557e6fe97d700498693c032d4a19e 100644 (file)
@@ -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
index 20024d91a651d436e6b60ef2196370260558a7e1..ec1d2583048a549f52617597853d4042a735f0d5 100644 (file)
@@ -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 \
index 1cbecb620ed509242f3ecd97e1991629a2ddf659..bfb4042163d2773c372e218bb9db437ee9b6b1a4 100644 (file)
+# 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:
index fd7b7e89350cb7437464fa6bf816e34e8bf0b709..c5652ba3eb3bab5458b55c58cdbed854bebb3f15 100644 (file)
@@ -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
+
index 15f1bd13c372a6750af46b04340db17ccdd75cf8..393d0cdd97d9079db0f4b7c57398711662dc3b96 100644 (file)
@@ -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 \
index c918f93942acffa24ce4148e7ed52de6bd639239..b1f8687380ffce5c9386ad9d0f71ffb27aa63524 100644 (file)
@@ -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)
index 954fe3cc6ca3a0b2bf396f0bce1686ad8bef1a00..0203ea726cf2d23874e7a37f2fbf3995b5a79daa 100644 (file)
@@ -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@ 
index 3de642dc08a08df1a3bc0222106f88764719e505..ab62e74e70e847afe2d545cacaaa84cd3e95c40f 100644 (file)
@@ -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.
index a1e0ef50efdd6d7bf5219af5f71a724bc4f572e3..36f64a4a64dc7cf86c8a16b8e416663e270b225b 100644 (file)
@@ -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)
index 8057551844219bebff944a30e46300a565092572..7af6f5ca577cbcb7683a9a9a64b21faea04401c8 100644 (file)
@@ -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)
index 57e174bb102975b5cb211bf2a0575ba94bcaf1b2..dce244b6bbe76874ee48ea528aa333e1df7e41da 100644 (file)
@@ -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) \
index aa151b4cd7ded7ebf7e478c328fd49a2507014d1..c3017773ca6a3575625d5bb94916dd5d6ae6ce68 100644 (file)
@@ -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 = \
index e6cdddc2494b5d81821538a80c4c749a692cfa2e..18a9a7290bc35571b07abc35755e580ef9c9684a 100644 (file)
@@ -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@ \
index c637e1284ac9b57c88fca49f1065946a1c96dab4..cd09fa879c11240a9e3035aeb2be48d57c522949 100644 (file)
@@ -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
 
 #
 # ===============================================================
index c3eaa963d6919692b164ce2d605ee8a27a31a955..e81652376f77d874be9361fd266e4b5289d20374 100644 (file)
@@ -86,7 +86,7 @@ CLEANFILES = swig_wrap.cpp
 #
 
 # Scripts to be installed.
-salomescript_DATA =\
+dist_salomescript_DATA =\
        LifeCycleCORBA.py \
        TestLifeCycleCORBA.py
 
index 0371578ff3addd71109c5fed73da50022c49330b..d55a4935ee282088d946e581a9e34db2834231ca 100644 (file)
@@ -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
index 357b3b75748bd34f5b4465b017a320fb17d9d352..1375410c62253c5d24748f258469962151749fc3 100644 (file)
@@ -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 
index 43fc715cd4c120d9c0465870eeb958eeb17772c6..fbd5a18991e197ea9ad15d70e82b0c7366f39362 100644 (file)
@@ -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)
index fe3b8750c57873e9eae06bbd19939800610309e0..929ce54019ba0850f6e106cc4f9a4a63256e5ccb 100644 (file)
 #  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
index 45678c79fe6e749e3c4d6f64b4a10232238c87d7..6c70a7a969a50f673dba2886fa07e64dbcd9c315 100644 (file)
@@ -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 \
index 017c82625595ac74d0b32ba9f67b93762f91779a..afdb659f1f7860aaed6ce055603fa3801cca4367 100644 (file)
@@ -26,4 +26,4 @@
 
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
-salomescript_DATA = IDLparser.py
+dist_salomescript_DATA = IDLparser.py
index ca4cb88595ea582626da525047b8229f6d5f0230..0c8142ff7d8a7abd03cf8d89e2164413dd439729 100644 (file)
@@ -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
index c9720d50364523ba6ac651687b16d7e431c08e2d..18abab3a14710c7b944603544934e190aaf3807e 100644 (file)
@@ -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
 
 
 #
index 6698f9d3aa2d30e23513a8e590f457d0a8c499ea..0ca8a56b205b5f72705345ea5e8b38b5b3454bd8 100644 (file)
@@ -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 =\
index c163ef141b37177c66841bb936c86b433976ac75..99f2bfc8c705760f475b106a99367b09004bb9f2 100755 (executable)
@@ -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) \
index 948e27e353d8f563f8585e47bd4eb37d367bbfb4..382674a88276ded336f0b1328e5595bdbef21380 100644 (file)
@@ -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) \
index b7bacf740c1c70a7a12ce109b7afaa1127deeaf4..228a9b344cd0a0a68c8feae5591b5873760cfb75 100644 (file)
@@ -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
index 8a0f9b30d2cf052cc545f74476526c05297f863f..1600013c5dcf86eb0c29d8ccebfffdfd5c907aaf 100644 (file)
@@ -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
index b6c9a7e021c34bcf1daea0858ab8abd43d0bdcb1..f9cec5a2bdea00f09b75b7f93c533068b574a1f2 100644 (file)
 
 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
index 186cf18a2b0d5a9dadd68dd0e895bb5d75b96e5f..3dd30e3d920731827e869eb409eeca7496741c71 100644 (file)
@@ -41,7 +41,7 @@ SRCROOT=$(srcdir)/../..
 salomeinclude_HEADERS = SALOMELocalTraceTest.hxx
 
 # Executable scripts to be installed
-salomescript_SCRIPTS = TestSALOMELocalTrace.py
+dist_salomescript_SCRIPTS = TestSALOMELocalTrace.py
 
 #
 # ===============================================================
index 74ab9ac638561e7cd3e793cb2222cb7152231ea6..928901b8e4a1ee5445ecfc3fe69d08ceb5f9072f 100644 (file)
@@ -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 \
index 8e90bb7b43b0aaf4fe0a6198dc5ad20062e6d301..dd715ebf3df1c2cf0cb9e8b31011adc0f9c1899e 100644 (file)
@@ -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
 
 
 #
index c32394078c561633fb087043a89601a30a97dfed..552de892d537532dee5c3b1a57ba5da29036ece3 100644 (file)
@@ -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
index 6ad0c10ea051dd5293c769b8fd503440230a4ce6..a996bca492e7b50e344780f2d567eb8f3c4981c2 100644 (file)
@@ -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)
 
index a054071ecaa72dad0249fc77c05ad100337a6601..dca3c40b03de325ba7dda6ea87b0079d9a15a9d1 100644 (file)
@@ -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)
index 22a1a939e1ae8ef48df0f30747cea77f55d799f1..de5fbefa237012680b407d510de1d43f91cb6a6b 100644 (file)
@@ -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 \
index 077b2bcf29ee8364cb5faa4fdb861d611387ce25..68cd76c6799c7079b86c6fa1cfe409f442b04761 100644 (file)
@@ -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
 
index f942322cb74cf0d7acccbe3e8881dce8cb621817..5ef20d823c1ba53401979ad5aa3c9081a0e8f56c 100644 (file)
@@ -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
 
 
 #