complete make dist step

diff --git a/Makefile.am b/Makefile.am
index 19467830f380b959cde2ca2ac0153ab59ca7a446..9987fba726f6dba8278088e2b3f6d065c45d1a98 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,8 @@ DISTCLEANFILES = a.out local-install.sh hack_libtool aclocal.m4 configure salome
 salomeinclude_DATA = KERNEL_version.h
 
 EXTRA_DIST = \
+       build_cmake \
+       build_cmake.bat \
        build_configure \
        clean_configure \
        LICENCE \

diff --git a/bin/appliskel/Makefile.am b/bin/appliskel/Makefile.am
index babc2c52306404e6152f809d84ed1193826bc13b..31d4e416c45bdef285d8b2dc96e8db4da4dcd0bc 100644 (file)
--- a/bin/appliskel/Makefile.am
+++ b/bin/appliskel/Makefile.am
@@ -56,3 +56,12 @@ install-data-hook:
        @for f in $(dist_appliskel_PYTHON) ; do \
         chmod -f a+x $(DESTDIR)$(appliskeldir)/$$f ; \
     done
+
+OBSOLETE_FILES = \
+    env.d \
+    CatalogResources.xml \
+    SalomeApp.xml \
+    killCurrentPort \
+    runParam
+
+EXTRA_DIST = $(OBSOLETE_FILES)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a5b1d2b661c80a37b73520c65e800a8a53f6fdc0..75f6ea45f20de1afe2e5110cae8497d10a26bd86 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,7 +29,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 SUBDIRS = salome docutils
 
-EXTRA_DIST = configuration_examples
+EXTRA_DIST = configuration_examples README.cluster-CCRT
 
 docs: usr_docs
 

diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
index 52c2f45b76cc7d6e6b169ae7656cb80416778d4a..125ba27c44dab3852db42d5942de5968cdef9638 100644 (file)
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -42,4 +42,5 @@ dev_docs:
 EXTRA_DIST= main.dox install.dox \
            kernel_resources.dox kernel_services.dox kernel_services_cpphelpers.dox \
            salome_application.dox unittests.dox \
-           salome_file.dox kernel_salome.dox
+           salome_file.dox kernel_salome.dox \
+           examples

diff --git a/idl/Makefile.am b/idl/Makefile.am
index e16582ec7a01f479a6dec02bd8de05a1f21ca9a1..54119fdb3bb6e935c6ab8a307f0bca5cb0521942 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -72,7 +72,7 @@ OTHER_IDL_FILES = \
 EXTRA_DIST= $(BASEIDL_FILES) $(MPIIDL_FILES) $(OTHER_IDL_FILES) \
            SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml \
            SALOME_PACOExtension.xml SALOME_ParamPorts.xml \
-           SALOME_GenericObj.xml
+           SALOME_GenericObj.xml SALOME_Exception.xml
 
 # This variable defines the files to be installed
 salomeidl_DATA        = $(IDL_FILES)

diff --git a/resources/Makefile.am b/resources/Makefile.am
index e96744c4349c30f6e66276e352236ef91b6bb528..ef8cd463b09f20178e186825169e470c6b11a092 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -35,13 +35,21 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 if WITHONLYLAUNCHER
   dist_salomeres_DATA=\
-       CatalogResources.xml \
        CatalogModulePersonnel.xml_skel
+
+  # VSR: little trick to avoid putting if generated files to the distribution archive
+  nodist_salomeres_DATA=\
+       CatalogResources.xml
 else
   dist_salomeres_DATA=\
-       CatalogResources.xml \
        CatalogModulePersonnel.xml_skel \
        channel.cfg \
-       KERNELCatalog.xml \
        SALOMEDS_Resources 
+
+  # VSR: little trick to avoid putting if generated files to the distribution archive
+  nodist_salomeres_DATA=\
+       CatalogResources.xml \
+       KERNELCatalog.xml
 endif
+
+EXTRA_DIST = CatalogDataType.xml

diff --git a/src/KERNEL_PY/kernel/Makefile.am b/src/KERNEL_PY/kernel/Makefile.am
index 91c7852c78b05790d1932a5cd589d22fb25a41b3..e89076a490cc7ff6e1541f5ae1e3809ea692e5af 100644 (file)
--- a/src/KERNEL_PY/kernel/Makefile.am
+++ b/src/KERNEL_PY/kernel/Makefile.am
@@ -28,7 +28,6 @@ mypkgpython_PYTHON = \
        deprecation.py   \
        logger.py        \
        termcolor.py     \
-       logconfig.py     \
        unittester.py    \
        pyunittester.py  \
        enumerate.py     \
@@ -38,6 +37,9 @@ mypkgpython_PYTHON = \
        diclookup.py     \
        threadhelper.py
 
+nodist_mypkgpython_PYTHON = \
+       logconfig.py
+
 # This set of modules required a running SALOME application.
 mypkgpython_PYTHON += \
        studyedit.py     \