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

diff --git a/adm_local/unix/config_files/check_SIERPINSKY.m4 b/adm_local/unix/config_files/check_SIERPINSKY.m4
index 1428bf225bb16adf7c5ea029537ab3020f9c6fa6..c34789ad20ec28f6ccba7aef6cf8e28417020ab4 100755 (executable)
--- a/adm_local/unix/config_files/check_SIERPINSKY.m4
+++ b/adm_local/unix/config_files/check_SIERPINSKY.m4
@@ -61,7 +61,7 @@ if test -f ${SIERPINSKY_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libSIERPINSKY.so
   fi
   
   SIERPINSKY_LDFLAGS=-L${SIERPINSKY_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-  SIERPINSKY_CXXFLAGS=-I${SIERPINSKY_ROOT_DIR}/include/salome
+  SIERPINSKY_CXXFLAGS="-I${SIERPINSKY_ROOT_DIR}/include/salome -I${SIERPINSKY_ROOT_DIR}/include/salome/skel"
 
   AC_SUBST(SIERPINSKY_ROOT_DIR)
   AC_SUBST(SIERPINSKY_LDFLAGS)

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index a784f4ee31bfffa977a2225d73262e54ec9cf9b0..e3b603cb57507d107685ee24816a35f98ee9a489 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 f7aadcd64035538d52eb48e3b40961a1a43901bb..93d8852a56ac17adc293dd0101ed3218b114db97 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -38,7 +38,7 @@ nodist_libSalomeIDLSIERPINSKY_la_SOURCES = \
 SierpinskyDynSK.cc: SierpinskySK.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)
 
 libSalomeIDLSIERPINSKY_la_CPPFLAGS = \
        $(KERNEL_CXXFLAGS) \

diff --git a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
index 8372c0dfdc7b834ca43c66424a5ae917bacfd085..9534ff95612eb97b06d6bc9865577e03070ea74a 100644 (file)
--- a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
+++ b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
@@ -23,7 +23,7 @@
 ///////////////////////////////////////////////////////////
 //
 #include "SIERPINSKY_Gen_i.hxx"
-#include <MED_Factory.hxx>
+#include <med/MED_Factory.hxx>
 #include <gd.h>
 
 using namespace MED;

diff --git a/src/Sierpinsky/SIERPINSKY_Gen_i.hxx b/src/Sierpinsky/SIERPINSKY_Gen_i.hxx
index e82fa804172cf6c4695808355cfdf015483638f5..c368eee5baeef1acdbb1b6c48ded5d6af8b31f43 100644 (file)
--- a/src/Sierpinsky/SIERPINSKY_Gen_i.hxx
+++ b/src/Sierpinsky/SIERPINSKY_Gen_i.hxx
@@ -25,7 +25,7 @@
 #ifndef __SIERPINSKY_GEN_I_HXX
 #define __SIERPINSKY_GEN_I_HXX
 
-#include "SALOME_Component_i.hxx"
+#include <kernel/SALOME_Component_i.hxx>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(Sierpinsky)

diff --git a/src/SierpinskyGUI/SierpinskyGUI.cxx b/src/SierpinskyGUI/SierpinskyGUI.cxx
index bb0a04fb22f3f66dc089ffac2e70310753da0830..6157ab5453c0e8652e205ecf6821401e11c6ab8f 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI.cxx
+++ b/src/SierpinskyGUI/SierpinskyGUI.cxx
@@ -24,12 +24,12 @@
 //
 #include "SierpinskyGUI.h"
 
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SalomeApp_Application.h>
-#include <SVTK_ViewModel.h>
-#include <SALOME_LifeCycleCORBA.hxx>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SVTK_ViewModel.h>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 #include <SierpinskyGUI_RunDlg.h>
 
 /*!

diff --git a/src/SierpinskyGUI/SierpinskyGUI.h b/src/SierpinskyGUI/SierpinskyGUI.h
index 3ad862503ad01a4125c9e24cae9c0164256537e4..c76c2e91be10c811c29a876dfddd72bcd77efe79 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI.h
+++ b/src/SierpinskyGUI/SierpinskyGUI.h
@@ -25,7 +25,7 @@
 #ifndef __SIERPINSKYGUI_H
 #define __SIERPINSKYGUI_H
 
-#include <SalomeApp_Module.h>
+#include <gui/SalomeApp_Module.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(Sierpinsky)

diff --git a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
index 6871e353925e5e4095c7b83c26c78eeb743b96e7..c540110a632a991b95db964c9dd2750ea7418854 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
+++ b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
@@ -24,8 +24,8 @@
 //
 #include "SierpinskyGUI_RunDlg.h"
 #include "SierpinskyGUI.h"
-#include "SALOME_LifeCycleCORBA.hxx"
-#include "SalomeApp_Application.h"
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <gui/SalomeApp_Application.h>
 
 #include <QLabel>
 #include <QLineEdit>
@@ -38,11 +38,11 @@
 #include <QProgressBar>
 #include <QApplication>
 
-#include <SUIT_Application.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_FileDlg.h>
-#include <QtxDoubleSpinBox.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/SUIT_MessageBox.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(Sierpinsky)