From f87024312bf4963a8c1b1fd4b49aedff8676488c Mon Sep 17 00:00:00 2001
From: adv <adv@opencascade.com>
Date: Fri, 19 Feb 2010 15:49:46 +0000
Subject: [PATCH] Improve build system: install each module's header files to
 the sub-directory of ${prefix}/include/salome/${module_name}

---
 adm_local/unix/config_files/check_SIERPINSKY.m4 |  2 +-
 adm_local/unix/make_common_starter.am           |  3 ++-
 idl/Makefile.am                                 |  2 +-
 src/Sierpinsky/SIERPINSKY_Gen_i.cxx             |  2 +-
 src/Sierpinsky/SIERPINSKY_Gen_i.hxx             |  2 +-
 src/SierpinskyGUI/SierpinskyGUI.cxx             | 12 ++++++------
 src/SierpinskyGUI/SierpinskyGUI.h               |  2 +-
 src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx      | 14 +++++++-------
 8 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/adm_local/unix/config_files/check_SIERPINSKY.m4 b/adm_local/unix/config_files/check_SIERPINSKY.m4
index 1428bf2..c34789a 100755
--- 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 a784f4e..e3b603c 100644
--- 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 f7aadcd..93d8852 100644
--- 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 8372c0d..9534ff9 100644
--- 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 e82fa80..c368eee 100644
--- 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 bb0a04f..6157ab5 100644
--- 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 3ad8625..c76c2e9 100644
--- 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 6871e35..c540110 100644
--- 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)
-- 
2.39.2