Improve build system: install each module's header files to the sub-directory of...

diff --git a/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 b/adm_local/unix/config_files/check_BLSURFPLUGIN.m4
index 1756adf544d336a331fcad9019241032404ad2d0..1e17a9190de8db0932a83228f930ba8c76dc8d51 100644 (file)
--- a/adm_local/unix/config_files/check_BLSURFPLUGIN.m4
+++ b/adm_local/unix/config_files/check_BLSURFPLUGIN.m4
@@ -46,7 +46,7 @@ if test "$with_BLSURFplugin" != "no" ; then
            AC_MSG_RESULT(Using BLSURF mesh plugin distribution in ${BLSURFPLUGIN_DIR})
            BLSURFPLUGIN_ROOT_DIR=${BLSURFPLUGIN_DIR}
            BLSURFPLUGIN_LDFLAGS=-L${BLSURFPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-           BLSURFPLUGIN_CXXFLAGS=-I${BLSURFPLUGIN_DIR}/include/salome
+           BLSURFPLUGIN_CXXFLAGS="-I${BLSURFPLUGIN_DIR}/include/salome -I${BLSURFPLUGIN_DIR}/include/salome/skel"
        else
            AC_MSG_WARN("Cannot find compiled BLSURF mesh plugin distribution")
        fi

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 2984cd29452a3042803d1f02eb4f2310c82e9fef..100140fcda8637b199bf033442630b64acd558b7 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -35,7 +35,8 @@ AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
 # ============================================================
 # Standard directory for installation
 #
-salomeincludedir   = $(includedir)/salome
+salomeincludedir   = $(includedir)/salome/@MODULE_NAME@
+salomeskeldir      = $(includedir)/salome/skel
 libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
 bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)

diff --git a/idl/Makefile.am b/idl/Makefile.am
index af8b04eccc601a56e41af0d12806e62012b96ea4..a9e0b9c93963cb58122fbdd8c403deb0ee41f2aa 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -39,7 +39,7 @@ lib_LTLIBRARIES = libSalomeIDLBLSURFPLUGIN.la
 nodist_libSalomeIDLBLSURFPLUGIN_la_SOURCES = BLSURFPlugin_AlgorithmSK.cc
 
 # header files must be exported: other modules have to use this library
-nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
+nodist_salomeskel_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLBLSURFPLUGIN_la_CPPFLAGS = \
        $(KERNEL_CXXFLAGS) \

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 736ba52d598b6ed6246f9687b0d93d03fc196f65..7168ab5aa796454631e7a22fd624b8270c6f75de 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -34,13 +34,13 @@ extern "C"{
 #include <structmember.h>
 
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
-#include <SMESH_Gen.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMESH_ControlsDef.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <limits>
 #include <list>

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx
index 51e6fca05de04f615dd79578b90b80d5abb42372..92bb31eb639db40b351fb00deb3248ac1434c574 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx
@@ -34,16 +34,16 @@
 #include <TopoDS_Shape.hxx>
 
 #include <Python.h>
-#include "SMESH_2D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
-#include <SMESHDS_Mesh.hxx>
-#include <SMDS_MeshElement.hxx>
-#include <SMDS_MeshNode.hxx>
-#include <SMESH_Gen_i.hxx>
+#include <smesh/SMESH_2D_Algo.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <smesh/SMDS_MeshElement.hxx>
+#include <smesh/SMDS_MeshNode.hxx>
+#include <smesh/SMESH_Gen_i.hxx>
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOMEDS)
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 extern "C"{
 #include "distene/blsurf.h"

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx
index 808321dee8d43561c4d838e4c789cd1caad4d58b..264a009acfe26ded889fd946ca04807eaa15392c 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx
@@ -22,10 +22,10 @@
 // ---
 //
 #include "BLSURFPlugin_BLSURF_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 //=============================================================================
 /*!

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx
index bf66433f66fbc992164a22d1201bdf7f0da11c4b..d9c1353ed93a55fe6ccbe2d43805e528e1560457 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx
@@ -27,7 +27,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(BLSURFPlugin_Algorithm)
 
-#include "SMESH_2D_Algo_i.hxx"
+#include <smesh/SMESH_2D_Algo_i.hxx>
 #include "BLSURFPlugin_BLSURF.hxx"
 
 // ======================================================

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
index 5eef8fff8d2af593a20419203fef6c61af278a53..aec73f3cb67ec872e41b06057ef11b9a3bc678b2 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
@@ -24,7 +24,7 @@
 // ---
 //
 #include "BLSURFPlugin_Hypothesis.hxx"
-#include <utilities.h>
+#include <kernel/utilities.h>
 #include <cstring>
 #include <iostream>
 #include <sstream>

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
index 8586dec0a39f642a1c68eb816203e5180d4279d1..a028d9298cc5fba01008f3c9fd493d6bd011dd82 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
@@ -26,7 +26,7 @@
 #ifndef _BLSURFPlugin_Hypothesis_HXX_
 #define _BLSURFPlugin_Hypothesis_HXX_
 
-#include "SMESH_Hypothesis.hxx"
+#include <smesh/SMESH_Hypothesis.hxx>
 #include <vector>
 #include <map>
 #include <set>

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
index 56d49f54404886b6298010a8f9ecd658cbfc7cbd..6180d3588482d7feb7389a7daf4ba4cfae64158d 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
@@ -23,12 +23,12 @@
 // ---
 //
 #include "BLSURFPlugin_Hypothesis_i.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_PythonDump.hxx"
-#include "GEOM_Object.hxx"
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>
+#include <geom/GEOM_Object.hxx>
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <stdexcept>
 #include "boost/regex.hpp"

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
index fef59b7298f4a245308ebb0e1701443c826c03ec..601e7cb06a184465839ca7855de645a16646d6f8 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
@@ -28,7 +28,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(BLSURFPlugin_Algorithm)
 
-#include "SMESH_Hypothesis_i.hxx"
+#include <smesh/SMESH_Hypothesis_i.hxx>
 #include "BLSURFPlugin_Hypothesis.hxx"
 
 class SMESH_Gen;

diff --git a/src/BLSURFPlugin/BLSURFPlugin_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_i.cxx
index df84e4142c805801af4fd1f6a2f6053af8f936c5..f8444231ba163e0bcb0ae693dfc8edf8acd9c73e 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_i.cxx
@@ -21,7 +21,7 @@
 // Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA)
 // ---
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef WIN32
   #if defined BLSURFPLUGIN_EXPORTS || defined BLSURFEngine_EXPORTS

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index 6ee6491cc6c0ac2bb4d440baddc9a842ab9b1c40..c173e15c4502cf031a37219c4bccc44977a7de7d 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -25,15 +25,15 @@
 //
 #include "BLSURFPluginGUI_HypothesisCreator.h"
 
-#include <SMESHGUI_Utils.h>
-#include <SMESHGUI_HypothesesUtils.h>
-#include <SMESHGUI_Dialog.h>
+#include <smesh/SMESHGUI_Utils.h>
+#include <smesh/SMESHGUI_HypothesesUtils.h>
+#include <smesh/SMESHGUI_Dialog.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_DoubleSpinBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_DoubleSpinBox.h>
 
 #include <QComboBox>
 #include <QLabel>
@@ -59,18 +59,18 @@
 #include <QTreeWidgetItem>
 #include <QModelIndexList>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <GEOM_Client.hxx>
+#include <geom/GEOM_Client.hxx>
 #include <TopoDS_Shape.hxx>
-#include <SMESH_Gen_i.hxx>
+#include <smesh/SMESH_Gen_i.hxx>
 #include <boost/shared_ptr.hpp>
 #include <structmember.h>
 
-// #include <GeomSelectionTools.h>
+// #include <smesh/GeomSelectionTools.h>
 #define WITH_SIZE_BOUNDARIES
 
 enum Topology {

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
index 2e9ca666546def7e2b8c0b73914e330a4941b170..0beccbe2d9b61e5e086a8b18d6e6934f81b40372 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
@@ -48,14 +48,14 @@
 
 #include <QItemDelegate>
 
-#include <SMESHGUI_Hypotheses.h>
+#include <smesh/SMESHGUI_Hypotheses.h>
 #include <SALOMEconfig.h>
 #include <cstring>
 #include <map>
 #include <set>
 #include <vector>
 #include <TopAbs_ShapeEnum.hxx>
-#include <GeomSelectionTools.h>
+#include <smesh/GeomSelectionTools.h>
 #include CORBA_SERVER_HEADER(BLSURFPlugin_Algorithm)
 
 class QGroupBox;