Add CMake files to the dist rules (make dist)

diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am
index 4781976b73a33791cb504da269a082641d7067e3..0ba898f3b6ff0be2a00a91c2645c4a2a0c389a4e 100644 (file)
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -20,4 +20,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = unix cmake_files

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 260923bdc0375cf5cf1cb720453bd1e7b1a6dd30..5df7d9f1006edf9f30615852dbc8bf05fde332d2 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -28,6 +28,11 @@
 AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h -I$(top_builddir)
 AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h -I$(top_builddir)
 
+# ============================================================
+# Cmake files wildcard (to add then to the distribution)
+# ============================================================
+CMAKEFILES         = $(notdir $(wildcard $(srcdir)/CMakeLists.txt))
+
 # ============================================================
 # This file defines the common definitions used in several
 # Makefile. This file must be included, if needed, by the file
@@ -37,7 +42,7 @@ AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h -I$(top_builddir)
 #
 salomeincludedir   = $(includedir)/salome
 libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
-libparaviewdir          = $(prefix)/lib@LIB_LOCATION_SUFFIX@/paraview
+libparaviewdir     = $(prefix)/lib@LIB_LOCATION_SUFFIX@/paraview
 bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)
 salomepythondir    = $(pythondir)/salome
@@ -58,7 +63,7 @@ admlocalunixdir    = $(admlocaldir)/unix
 admlocalm4dir      = $(admlocaldir)/unix/config_files
 
 # Directory for install cmake files
-admlocal_cmakedir = $(admlocaldir)/cmake_files
+admlocal_cmakedir  = $(admlocaldir)/cmake_files
 
 # Shared modules installation directory
 sharedpkgpythondir = $(salomepythondir)/shared_modules
@@ -86,7 +91,8 @@ ui_%.h: %.ui
 
 # extra distributed files
 EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \
-             $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=resources/%.ts)
+             $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=resources/%.ts) \
+             $(CMAKEFILES)
 
 # customize clean operation
 mostlyclean-local:

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 583c18bab56e0fcbf6d9ffcde984fefaa149f244..6fd352bfeff6b2cdd621e62c0e0793ef858a42dc 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,6 +25,9 @@
 # Date : 30/11/2001
 # $Header$
 #
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = salome
 
 usr_docs:

diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
index 705a2675b6fae7429e7a83b0ad8f2d688264febc..1cdadbb48e305e64611e9a4a2516c9d034bc7ebb 100644 (file)
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -25,6 +25,9 @@
 # Date : 30/11/2001
 # $Header$
 #
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = tui gui
 SUBDIRSTUI = tui
 SUBDIRSGUI = gui

diff --git a/src/Makefile.am b/src/Makefile.am
index a0f768d8b382d822fa695a3b53a9375e51a2eb92..f671a1216d11637b244322a3347decc7d8f51b86 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,9 +23,12 @@
 #  File   : Makefile.am
 #  Author : Patrick GOLDBRONN (CEA)
 
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 ##
 # Common packages
 ##
+
 SUBDIRS_COMMON = CASCatch Qtx Style DDS QDS ObjBrowser SUIT SUITApp STD CAF CAM LogWindow Prs Event OpenGLUtils GUI_PY
 
 ##

diff --git a/src/SalomeApp/pluginsdemo/Makefile.am b/src/SalomeApp/pluginsdemo/Makefile.am
index f949438e406e8ad91b21015b208a4d910690cecb..b75268ba49e84ed31126ed42aecf304c95821b2a 100644 (file)
--- a/src/SalomeApp/pluginsdemo/Makefile.am
+++ b/src/SalomeApp/pluginsdemo/Makefile.am
@@ -39,3 +39,5 @@ plugins_PYTHON = \
        xalome.py         \
        minmax_dialog.py  \
        minmax_plugin.py
+
+EXTRA_DIST += minmax.ui

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 96794db1b362eab717a5aaf54f0ea4533c5650ea..0af2898b873dd3b20e3e085c0b913549cd3d83d0 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,4 +20,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = vtkEDFOverloads dlgfactory