From 71ef8886b620ea21982003ec3e20735d7419a9f7 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 9 Oct 2012 10:56:56 +0000 Subject: [PATCH] 1) Add CMake files to the dist rules (make dist) 2) Fix problems of make dist (missing files) --- adm_local/Makefile.am | 2 ++ adm_local/unix/make_common_starter.am | 12 +++++++++--- doc/Makefile.am | 3 +++ doc/salome/Makefile.am | 3 +++ src/Makefile.am | 3 +++ src/SalomeApp/Test/CMakeLists.txt | 2 +- src/SalomeApp/pluginsdemo/Makefile.am | 2 ++ tools/Makefile.am | 2 ++ 8 files changed, 25 insertions(+), 4 deletions(-) diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 4781976b7..0ba898f3b 100644 --- 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 260923bdc..5df7d9f10 100644 --- 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 583c18bab..6fd352bfe 100644 --- 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 705a2675b..1cdadbb48 100644 --- 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 a0f768d8b..f671a1216 100755 --- 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/Test/CMakeLists.txt b/src/SalomeApp/Test/CMakeLists.txt index 4936c7cec..886ff3836 100755 --- a/src/SalomeApp/Test/CMakeLists.txt +++ b/src/SalomeApp/Test/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${KERNEL_ROOT_DIR}/include/salome ) -SET(COMMON_LIBS ${CPPUNIT_LIBS}) +SET(COMMON_LIBS "${CPPUNIT_LIBS} ${PLATFORM_LIBS}") SET(COMMON_FLAGS "${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") ADD_LIBRARY(SalomeAppTest SHARED SalomeAppTest.cxx) diff --git a/src/SalomeApp/pluginsdemo/Makefile.am b/src/SalomeApp/pluginsdemo/Makefile.am index f949438e4..b75268ba4 100644 --- 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 96794db1b..0af2898b8 100644 --- 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 -- 2.39.2