PR: add missing files to dist

diff --git a/Makefile.am b/Makefile.am
index ca8fe996d5e3b65ff638696a305f7c3ea82696ac..061c842677d147105f4c8ca198a91157161926ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,3 +14,13 @@ SUBDIRS = $(IDLDIR) src doc salome_adm bin resources
 DIST_SUBDIRS=   idl src doc salome_adm bin resources
 
 DISTCLEANFILES = a.out
+
+EXTRA_DIST = \
+       build_configure \
+       clean_configure \
+       LICENCE \
+       README.FIRST.txt \
+       DEPRECATED
+
+dist-hook:
+       rm -rf `find $(distdir) -name CVS`

diff --git a/build_configure b/build_configure
index 393cc4bc5cd6f6115e55bece2121870598883ab7..c682f1fad503ed755e83dc5560d6aa9396f9337f 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -10,31 +10,67 @@
 #
 
 
-# This creates the aclocal.m4 file from the standard macro and the
+# ____________________________________________________________________
+# aclocal creates the aclocal.m4 file from the standard macro and the
 # custom macro embedded in the directory salome_adm/unix/config_files.
+# output:
+#   aclocal.m4
+#   autom4te.cache (directory)
 echo "====================================================== aclocal"
+
 aclocal -I salome_adm/unix/config_files || exit 1
 
-# This instruction creates some configuration files (ltmain.sh,
+
+# ____________________________________________________________________
+# libtoolize creates some configuration files (ltmain.sh,
 # config.guess and config.sub). It only depends on the libtool
 # version. The files are created in the directory specified with the
 # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac).
+# output:
+#   salome_adm/unix/config_files/config.guess
+#   salome_adm/unix/config_files/config.sub
+#   salome_adm/unix/config_files/ltmain.sh
 echo "====================================================== libtoolize"
+
 libtoolize --force --copy --automake || exit 1
 
-# This instruction creates some scripts used in building process
+
+# ____________________________________________________________________
+# autoconf creates the configure script from the file configure.ac (or
+# configure.in if configure.ac doesn't exist)
+# output:
+#   configure
+echo "====================================================== autoconf"
+
+autoconf
+
+# ____________________________________________________________________
+# autoheader creates config.h.in
+# output:
+#   configure
+#echo "====================================================== autoheader"
+
+#autoheader
+
+# ____________________________________________________________________
+# automake creates some scripts used in building process
 # (install-sh, missing, ...). It only depends on the automake
 # version. The files are created in the directory specified with the
 # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also
 # creates the Makefile.in files from the Makefile.am files.
+# output:
+#   salome_adm/unix/config_files/compile
+#   salome_adm/unix/config_files/depcomp
+#   salome_adm/unix/config_files/install-sh
+#   salome_adm/unix/config_files/missing
+#   salome_adm/unix/config_files/py-compile
+#   Makefile.in (from Makefile.am)
 echo "====================================================== automake"
+
 automake --add-missing --copy --gnu
 
-# This creates the configure script from the file configure.ac (or
-# configure.in if configure.ac doesn't exist)
-echo "====================================================== autoconf"
-autoconf
 
+# ____________________________________________________________________
 #
 # Note that automake could be executed at last after autoconf. The
 # order doesn't matter.

diff --git a/configure.ac b/configure.ac
index f3d7fbaa2db4c9dd97cebb296650b5b7bda6ff0d..c055d364c8254afc85b3d46c32ad1bdceae824cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
+#AC_CONFIG_HEADER([config.h])
 
 PACKAGE=salome
 AC_SUBST(PACKAGE)

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 393d0cdd97d9079db0f4b7c57398711662dc3b96..b8f2d501f1438a7b505b1974dc6bccf36cfddacc 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -16,9 +16,11 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 dist_salomeres_DATA=\
        CatalogDataType.xml \
-       KERNELCatalog.xml \
        CatalogResources.xml \
+       CatalogModulePersonnel.xml_skel \
        close.png \
        config \
        channel.cfg \
+       KERNELCatalog.xml \
+       salomeCommonModel.spml \
        SALOMEDS_Resources

diff --git a/salome_adm/unix/config_files/Makefile.am b/salome_adm/unix/config_files/Makefile.am
index 0876e34d11be59d54a4939107ab6cb38e44ae735..6af80058878c5b987375880fed57e351e37501c8 100644 (file)
--- a/salome_adm/unix/config_files/Makefile.am
+++ b/salome_adm/unix/config_files/Makefile.am
@@ -4,18 +4,14 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 # The deprecated files are deprecated for the KERNEL but not for the
 # related modules (GUI, MED, ...). Some files have to be installed.
 DEPRECATED_FILES=\
-       DEPRECATED/ltconfig \
-       DEPRECATED/install-sh \
-       DEPRECATED/config.sub \
-       DEPRECATED/config.guess \
-       DEPRECATED/ltmain.sh \
-       DEPRECATED/libtool.m4 \
+       DEPRECATED/ac_cc_warnings.m4 \
        DEPRECATED/ac_cxx_bool.m4 \
        DEPRECATED/ac_cxx_mutable.m4 \
        DEPRECATED/ac_cxx_partial_specialization.m4 \
-       DEPRECATED/check_mico.m4 \
        DEPRECATED/ac_cxx_typename.m4 \
-       DEPRECATED/ac_cc_warnings.m4
+       DEPRECATED/check_mico.m4 \
+       DEPRECATED/libtool.m4 \
+       DEPRECATED/ltconfig
 
 dist_salomem4_DATA=\
 ac_cxx_depend_flag.m4 \
@@ -26,6 +22,7 @@ ac_cxx_template_options.m4 \
 ac_cxx_use_std_iostream.m4 \
 ac_cxx_warnings.m4 \
 ac_linker_options.m4 \
+acx_pthread.m4 \
 check_Kernel.m4 \
 check_boost.m4 \
 check_cas.m4 \
@@ -42,7 +39,6 @@ check_msg2qm.m4 \
 check_omniorb.m4 \
 check_opengl.m4 \
 check_openpbs.m4 \
-check_pthreads.m4 \
 check_pyqt.m4 \
 check_qt.m4 \
 check_qwt.m4 \

diff --git a/src/HDFPersist/Makefile.am b/src/HDFPersist/Makefile.am
index a24d274f28bde8ae45737459ecd103787c704a53..372fdd5041952da1e4c214b3c1376ff81c246cad 100644 (file)
--- a/src/HDFPersist/Makefile.am
+++ b/src/HDFPersist/Makefile.am
@@ -92,3 +92,15 @@ libSalomeHDFPersist_la_CPPFLAGS = @CAS_CPPFLAGS@ @HDF5_INCLUDES@ -DPCLINUX \
                                   -I$(srcdir)/../SALOMELocalTrace \
                                   -I$(srcdir)/../Basics
 libSalomeHDFPersist_la_LIBADD   = @CAS_KERNEL@ @HDF5_LIBS@
+
+
+EXTRA_DIST = \
+  test1.c \
+  test2.c \
+  test3.cxx \
+  test4.cxx \
+  test5.cxx \
+  test6.cxx \
+  test7.cxx \
+  test8.cxx \
+  test9.cxx