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

diff --git a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4
index 5ed3b2d1be2f7a9fb7e24e3d2224a5a0003f3087..0b8c4e62c541b3b02ec04afe2b0505d3e466a7a2 100755 (executable)
--- a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4
+++ b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4
@@ -62,7 +62,7 @@ if test -f ${GHS3DPLUGIN_DIR}/lib/salome/libGHS3DEngine.so  ; then
   if test "x$GHS3DPLUGIN_ROOT_DIR" == "x" ; then
     GHS3DPLUGIN_ROOT_DIR=${GHS3DPLUGIN_DIR}
   fi
-  GHS3DPLUGIN_CXXFLAGS+=-I${GHS3DPLUGIN_ROOT_DIR}/include/salome
+  GHS3DPLUGIN_CXXFLAGS+="-I${GHS3DPLUGIN_ROOT_DIR}/include/salome -I${GHS3DPLUGIN_ROOT_DIR}/include/salome/skel"
   GHS3DPLUGIN_LDFLAGS+=-L${GHS3DPLUGIN_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
   AC_SUBST(GHS3DPLUGIN_ROOT_DIR)
   AC_SUBST(GHS3DPLUGIN_LDFLAGS)

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 656184cbd19ba97d611f6af9b545334915820e0f..1188b3cf6952e25d6397faf86ac4ff7c0e011985 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -31,7 +31,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 613df2cdad5d39c62a04ab108c5a343d62211a5b..5b133709bc2e91b5a6fd9f2874edcdea69eb2b2b 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -38,7 +38,7 @@ nodist_libSalomeIDLGHS3DPLUGIN_la_SOURCES = \
 GHS3DPlugin_AlgorithmDynSK.cc: GHS3DPlugin_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)
 
 libSalomeIDLGHS3DPLUGIN_la_CPPFLAGS = \
        -I$(top_builddir)/idl \

diff --git a/src/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin_GHS3D.cxx
index 2efd30f4705c5558e508ff5db3083168c2c921e9..534762901476c3bae0a183ffc88062590c4fde73 100644 (file)
--- a/src/GHS3DPlugin_GHS3D.cxx
+++ b/src/GHS3DPlugin_GHS3D.cxx
@@ -28,18 +28,18 @@
 #include "GHS3DPlugin_Hypothesis.hxx"
 
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
-#include "SMESH_Gen.hxx"
-#include "SMESH_Mesh.hxx"
-#include "SMESH_Comment.hxx"
-#include "SMESH_MesherHelper.hxx"
-#include "SMESH_MeshEditor.hxx"
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_Comment.hxx>
+#include <smesh/SMESH_MesherHelper.hxx>
+#include <smesh/SMESH_MeshEditor.hxx>
 
-#include "SMDS_MeshElement.hxx"
-#include "SMDS_MeshNode.hxx"
-#include "SMDS_FaceOfNodes.hxx"
-#include "SMDS_VolumeOfNodes.hxx"
+#include <smesh/SMDS_MeshElement.hxx>
+#include <smesh/SMDS_MeshNode.hxx>
+#include <smesh/SMDS_FaceOfNodes.hxx>
+#include <smesh/SMDS_VolumeOfNodes.hxx>
 
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepBndLib.hxx>
@@ -64,7 +64,7 @@
 #include <BRepGProp.hxx>
 #include <GProp_GProps.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef WIN32
 #include <io.h>

diff --git a/src/GHS3DPlugin_GHS3D.hxx b/src/GHS3DPlugin_GHS3D.hxx
index fdcded78528766751db0a51181436ccee5368bcb..e9c6d2d5d648d2dbce24bba1f2a5cf53df7ee582 100644 (file)
--- a/src/GHS3DPlugin_GHS3D.hxx
+++ b/src/GHS3DPlugin_GHS3D.hxx
@@ -26,7 +26,7 @@
 #ifndef _GHS3DPlugin_GHS3D_HXX_
 #define _GHS3DPlugin_GHS3D_HXX_
 
-#include "SMESH_3D_Algo.hxx"
+#include <smesh/SMESH_3D_Algo.hxx>
 
 #include <map>
 #include <vector>

diff --git a/src/GHS3DPlugin_GHS3D_i.cxx b/src/GHS3DPlugin_GHS3D_i.cxx
index 83c3ae73efe91a6d2865a5981eb57e0bf1a099fa..e0729832761c9a3ac75fe76b40b3c66d024c7dda 100644 (file)
--- a/src/GHS3DPlugin_GHS3D_i.cxx
+++ b/src/GHS3DPlugin_GHS3D_i.cxx
@@ -23,10 +23,10 @@
 //  $Header$
 //
 #include "GHS3DPlugin_GHS3D_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>
 #include "GHS3DPlugin_GHS3D.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/GHS3DPlugin_GHS3D_i.hxx b/src/GHS3DPlugin_GHS3D_i.hxx
index 6fea6fc6c49b845038f7a0e68b4a1ef5b64170d0..00e541d98a2b37ce6f972ea6d0c05d342aa16630 100644 (file)
--- a/src/GHS3DPlugin_GHS3D_i.hxx
+++ b/src/GHS3DPlugin_GHS3D_i.hxx
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(GHS3DPlugin_Algorithm)
 #include CORBA_SERVER_HEADER(SALOME_Exception)
 
-#include "SMESH_3D_Algo_i.hxx"
+#include <smesh/SMESH_3D_Algo_i.hxx>
 #include "GHS3DPlugin_GHS3D.hxx"
 
 // ======================================================

diff --git a/src/GHS3DPlugin_Hypothesis.hxx b/src/GHS3DPlugin_Hypothesis.hxx
index 119bcd51c0d6636886c06724aeafa54793d99c55..9f46144aa91f3af122a1d87e4b4c1b3c69aca393 100644 (file)
--- a/src/GHS3DPlugin_Hypothesis.hxx
+++ b/src/GHS3DPlugin_Hypothesis.hxx
@@ -26,8 +26,8 @@
 
 #include "GHS3DPlugin_Defs.hxx"
 
-#include <SMESH_Hypothesis.hxx>
-#include <utilities.h>
+#include <smesh/SMESH_Hypothesis.hxx>
+#include <kernel/utilities.h>
 
 #include <stdexcept>
 #include <map>

diff --git a/src/GHS3DPlugin_Hypothesis_i.cxx b/src/GHS3DPlugin_Hypothesis_i.cxx
index 570f96bbe670ecc8fa3c1c07b269e1a3c4744f95..9aed53aac38de185960c20f51fda4211ef0a73cd 100644 (file)
--- a/src/GHS3DPlugin_Hypothesis_i.cxx
+++ b/src/GHS3DPlugin_Hypothesis_i.cxx
@@ -22,12 +22,12 @@
 //
 #include "GHS3DPlugin_Hypothesis_i.hxx"
 
-#include <SMESH_Gen.hxx>
-#include <SMESH_PythonDump.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>
 
-#include <Utils_CorbaException.hxx>
-#include <utilities.h>
-#include <SMESH_Mesh_i.hxx>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
+#include <smesh/SMESH_Mesh_i.hxx>
 
 //=======================================================================
 //function : GHS3DPlugin_Hypothesis_i

diff --git a/src/GHS3DPlugin_Hypothesis_i.hxx b/src/GHS3DPlugin_Hypothesis_i.hxx
index fa70cb5b961e4382e95286ae50f802a6a3cd4465..3fbb95d3db4b321a5036b61440b9d323fe03e53b 100644 (file)
--- a/src/GHS3DPlugin_Hypothesis_i.hxx
+++ b/src/GHS3DPlugin_Hypothesis_i.hxx
@@ -29,7 +29,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GHS3DPlugin_Algorithm)
 
-#include "SMESH_Hypothesis_i.hxx"
+#include <smesh/SMESH_Hypothesis_i.hxx>
 #include "GHS3DPlugin_Hypothesis.hxx"
 
 class SMESH_Gen;

diff --git a/src/GHS3DPlugin_i.cxx b/src/GHS3DPlugin_i.cxx
index 309ef5af492011b2eb67c21c059f13129f534a4c..bf6be9bc1ba0ddb5a877d41e66857df093cf3037 100644 (file)
--- a/src/GHS3DPlugin_i.cxx
+++ b/src/GHS3DPlugin_i.cxx
@@ -22,9 +22,9 @@
 //  Module : SMESH
 //  $Header$
 //
-#include "SMESH_Hypothesis_i.hxx"
+#include <smesh/SMESH_Hypothesis_i.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "GHS3DPlugin_GHS3D_i.hxx"
 #include "GHS3DPlugin_Hypothesis_i.hxx"

diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
index f9f7e37d0c73b885b5652f9a8825755176e51b8e..ade8aee9265c4aa7194317324a78c342a175501c 100644 (file)
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
@@ -24,15 +24,15 @@
 //
 #include "GHS3DPluginGUI_HypothesisCreator.h"
 
-#include <SMESHGUI_Utils.h>
-#include <SMESHGUI_HypothesesUtils.h>
+#include <smesh/SMESHGUI_Utils.h>
+#include <smesh/SMESHGUI_HypothesesUtils.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_FileDlg.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_TypeFilter.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_TypeFilter.h>
 
 #include <QComboBox>
 #include <QLabel>
@@ -53,7 +53,7 @@
 #include <QModelIndexList>
 
 #include <stdexcept>
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 // tabs
 enum {

diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.h b/src/GUI/GHS3DPluginGUI_HypothesisCreator.h
index 4cf1809c454d4cf5bbadb2bb06b9494bbd41e537..24e0bdc6f766a6b4f96b116ee9d66e370843068e 100644 (file)
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.h
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.h
@@ -34,8 +34,8 @@
   #define GHS3DPLUGINGUI_EXPORT
 #endif
 
-#include <SMESHGUI_Hypotheses.h>
-// #include <SalomeApp_DoubleSpinBox.h>
+#include <smesh/SMESHGUI_Hypotheses.h>
+// #include <gui/SalomeApp_DoubleSpinBox.h>
 
 #include <QItemDelegate>
 #include <map>