From: vsr <vsr@opencascade.com>
Date: Sat, 5 Nov 2011 16:34:56 +0000 (+0000)
Subject: complete make dist step
X-Git-Tag: RELIQUAT_6x_15112011~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a0f4b7da9e9b8bb272a27617728544cece8d3d70;p=modules%2Fkernel.git

complete make dist step
---

diff --git a/Makefile.am b/Makefile.am
index 19467830f..9987fba72 100644
--- 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 babc2c523..31d4e416c 100644
--- 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 a5b1d2b66..75f6ea45f 100644
--- 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 52c2f45b7..125ba27c4 100644
--- 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 e16582ec7..54119fdb3 100644
--- 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 e96744c43..ef8cd463b 100644
--- 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 91c7852c7..e89076a49 100644
--- 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     \