From af57a67b78aeac58922d3fcfa9dee1f0b02269a7 Mon Sep 17 00:00:00 2001
From: adv <adv@opencascade.com>
Date: Fri, 19 Feb 2010 15:47:53 +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_MULTIPR.m4 |  2 +-
 adm_local/unix/make_common_starter.am        |  3 +-
 idl/Makefile.am                              |  2 +-
 src/MULTIPR/MULTIPR_i.cxx                    | 10 +++---
 src/MULTIPR/MULTIPR_i.hxx                    |  8 ++---
 src/MULTIPRGUI/MULTIPR_GUI.cxx               | 36 ++++++++++----------
 src/MULTIPRGUI/MULTIPR_GUI.h                 | 10 +++---
 src/MULTIPRGUI/MULTIPR_GUI_Dlg.cxx           | 16 ++++-----
 src/MULTIPRGUI/MULTIPR_GUI_Dlg.h             |  2 +-
 9 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/adm_local/unix/config_files/check_MULTIPR.m4 b/adm_local/unix/config_files/check_MULTIPR.m4
index 9f10db0..a5f3c59 100755
--- a/adm_local/unix/config_files/check_MULTIPR.m4
+++ b/adm_local/unix/config_files/check_MULTIPR.m4
@@ -48,7 +48,7 @@ if test -f ${MULTIPR_DIR}/lib/salome/libMULTIPR.so  ; then
   AC_SUBST(MULTIPR_ROOT_DIR)
   
   MULTIPR_LDFLAGS=-L${MULTIPR_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-  MULTIPR_CXXFLAGS=-I${MULTIPR_DIR}/include/salome
+  MULTIPR_CXXFLAGS="-I${MULTIPR_DIR}/include/salome -I${MULTIPR_DIR}/include/salome/skel"
 
   AC_SUBST(MULTIPR_LDFLAGS)
   AC_SUBST(MULTIPR_CXXFLAGS)
diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index cd85151..42063b9 100644
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -34,7 +34,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 e5ae78d..4904a32 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -41,7 +41,7 @@ nodist_libSalomeIDLMULTIPR_la_SOURCES = \
 MULTIPRDynSK.cc: MULTIPRSK.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)
 
 libSalomeIDLMULTIPR_la_CPPFLAGS =			\
 	$(KERNEL_CXXFLAGS)			\
diff --git a/src/MULTIPR/MULTIPR_i.cxx b/src/MULTIPR/MULTIPR_i.cxx
index 147c6b7..f48eb75 100644
--- a/src/MULTIPR/MULTIPR_i.cxx
+++ b/src/MULTIPR/MULTIPR_i.cxx
@@ -19,16 +19,16 @@
 using namespace std;
 
 #include "MULTIPR_i.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <string>
 #include <sstream>
 
-#include "MULTIPR_API.hxx"
-#include "MULTIPR_Exceptions.hxx"
-#include "MULTIPR_Utils.hxx"
+#include <med/MULTIPR_API.hxx>
+#include <med/MULTIPR_Exceptions.hxx>
+#include <med/MULTIPR_Utils.hxx>
 
-#include <SALOMEDS_Tool.hxx>
+#include <kernel/SALOMEDS_Tool.hxx>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS)
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
diff --git a/src/MULTIPR/MULTIPR_i.hxx b/src/MULTIPR/MULTIPR_i.hxx
index 7e1eaed..0e501d3 100644
--- a/src/MULTIPR/MULTIPR_i.hxx
+++ b/src/MULTIPR/MULTIPR_i.hxx
@@ -21,12 +21,12 @@
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(MULTIPR)
-#include "SALOME_Component_i.hxx"
-#include "Utils_CorbaException.hxx"
+#include <kernel/SALOME_Component_i.hxx>
+#include <kernel/Utils_CorbaException.hxx>
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
-#include "MULTIPR_Obj.hxx"
+#include <med/MULTIPR_Obj.hxx>
 
 #include <map>
 #include <vector>
diff --git a/src/MULTIPRGUI/MULTIPR_GUI.cxx b/src/MULTIPRGUI/MULTIPR_GUI.cxx
index 397842c..18e4cb4 100644
--- a/src/MULTIPRGUI/MULTIPR_GUI.cxx
+++ b/src/MULTIPRGUI/MULTIPR_GUI.cxx
@@ -18,32 +18,32 @@
 // MULTIPR Includes
 #include "MULTIPR_GUI.h"
 #include "MULTIPR_GUI_Dlg.h"
-#include "MULTIPR_Utils.hxx"
+#include <med/MULTIPR_Utils.hxx>
 
 // Salome Includes
-#include <SalomeApp_Application.h>
-#include <SalomeApp_DataModel.h>
-#include <SalomeApp_Study.h>
-#include <SalomeApp_CheckFileDlg.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_DataModel.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_CheckFileDlg.h>
 
-#include <LightApp_Study.h>
-#include <LightApp_DataModel.h>
-#include <LightApp_DataOwner.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Study.h>
+#include <gui/LightApp_DataModel.h>
+#include <gui/LightApp_DataOwner.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <CAM_DataModel.h>
-#include <CAM_Module.h>
+#include <gui/CAM_DataModel.h>
+#include <gui/CAM_Module.h>
 
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include <SALOME_LifeCycleCORBA.hxx>
-#include <SALOMEDS_Study.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <kernel/SALOMEDS_Study.hxx>
 
-#include <SALOME_Event.h>
+#include <gui/SALOME_Event.h>
 
-#include <QtxPopupMgr.h>
+#include <gui/QtxPopupMgr.h>
 
 // QT Includes
 #include <QApplication>
diff --git a/src/MULTIPRGUI/MULTIPR_GUI.h b/src/MULTIPRGUI/MULTIPR_GUI.h
index 91aa2d2..438689a 100644
--- a/src/MULTIPRGUI/MULTIPR_GUI.h
+++ b/src/MULTIPRGUI/MULTIPR_GUI.h
@@ -19,15 +19,15 @@
 // Includes section
 //*****************************************************************************
 
-#include <SalomeApp_Module.h>
-#include <LightApp_DataObject.h>
-//#include <LightApp_DataModel.h>
-#include <SalomeApp_DataModel.h>
+#include <gui/SalomeApp_Module.h>
+#include <gui/LightApp_DataObject.h>
+//#include <gui/LightApp_DataModel.h>
+#include <gui/SalomeApp_DataModel.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(MULTIPR)
 
-#include "MULTIPR_ProgressCallback.hxx"
+#include <med/MULTIPR_ProgressCallback.hxx>
 
 
 //*****************************************************************************
diff --git a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.cxx b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.cxx
index 0f53ce0..f6a2b93 100644
--- a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.cxx
+++ b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.cxx
@@ -19,14 +19,14 @@
 #include "MULTIPR_GUI.h"
 
 // Salome Includes
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_CheckFileDlg.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SALOME_LifeCycleCORBA.hxx>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_CheckFileDlg.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
 // QT Includes
 #include <QApplication>
diff --git a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h
index 7e69163..1ae7288 100644
--- a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h
+++ b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h
@@ -22,7 +22,7 @@
 #include <QDialog>
 #include <QProgressDialog>
 
-#include "MULTIPR_ProgressCallback.hxx"
+#include <med/MULTIPR_ProgressCallback.hxx>
 
 
 //*****************************************************************************
-- 
2.39.2