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

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 57e246b7fab21af13c27c9684a746649f3758ec5..dc4d168e19f0fedd12bfab2fb35bbcad807f938f 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -129,7 +129,7 @@ endif
 $(DYNIDL_SRCS) : $(IDL_SOURCES)
 
 # also install all generated headers to use result library from another modules
-salomeinclude_DATA= $(STATIDL_SOURCES:%SK.cc=%.hh)
+salomeskel_DATA= $(STATIDL_SOURCES:%SK.cc=%.hh)
 
 if WITH_PACO_PARALLEL
 PAR = SALOME_ComponentPaCO.hxx SALOME_ComponentPaCO.cxx \

diff --git a/salome_adm/unix/Makefile.am b/salome_adm/unix/Makefile.am
index c339c22f04eeca55d35bb26f3792fa7e874c203a..3a01a22c81d000273519f06ed5f289156461e102 100644 (file)
--- a/salome_adm/unix/Makefile.am
+++ b/salome_adm/unix/Makefile.am
@@ -35,7 +35,7 @@ DEPRECATED_FILES=\
 
 # rules for install and build (see make_common_starter.am)
 salomeadmux_DATA = SALOMEconfig.h.in
-salomeinclude_DATA = SALOMEconfig.h
+salometopinc_DATA = SALOMEconfig.h
 BUILT_SOURCES=SALOMEconfig.ref SALOMEconfig.h SALOMEconfig.h.in
 
 mostlyclean-local:

diff --git a/salome_adm/unix/config_files/check_Kernel.m4 b/salome_adm/unix/config_files/check_Kernel.m4
index 097424ac3c8fb28afbe44e574977d2c4cbafdbbc..6e2f40601145532dcb3ab3928fb490699e941253 100644 (file)
--- a/salome_adm/unix/config_files/check_Kernel.m4
+++ b/salome_adm/unix/config_files/check_Kernel.m4
@@ -72,7 +72,7 @@ if test -f ${KERNEL_DIR}/bin/salome/runSalome ; then
    AC_SUBST(KERNEL_SITE_DIR)
 
    KERNEL_LDFLAGS=-L${KERNEL_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   KERNEL_CXXFLAGS=-I${KERNEL_DIR}/include/salome
+   KERNEL_CXXFLAGS="-I${KERNEL_DIR}/include/salome -I${KERNEL_DIR}/include/salome/skel"
 
    AC_SUBST(KERNEL_LDFLAGS)
    AC_SUBST(KERNEL_CXXFLAGS)

diff --git a/salome_adm/unix/make_common_starter.am b/salome_adm/unix/make_common_starter.am
index deb5ea9b3a2ac3e6075eed034e596bf2355640b6..2597f53c6c7bdb9b689c91d488a29c0c712f4549 100644 (file)
--- a/salome_adm/unix/make_common_starter.am
+++ b/salome_adm/unix/make_common_starter.am
@@ -39,7 +39,9 @@ endif
 # ============================================================
 # Standard directory for installation
 #
-salomeincludedir   = $(includedir)/salome
+salometopincdir    = $(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/src/Launcher/Launcher.hxx b/src/Launcher/Launcher.hxx
index e3f5dd19374788d6d061d313abb6e4e3807e224d..3d6d681a0e49c0b4258d4ce01feee29fdc7b2218 100644 (file)
--- a/src/Launcher/Launcher.hxx
+++ b/src/Launcher/Launcher.hxx
@@ -26,7 +26,7 @@
 #include "Launcher_Job.hxx"
 
 #include "ResourcesManager.hxx"
-#include <SALOME_ResourcesCatalog_Parser.hxx>
+#include "SALOME_ResourcesCatalog_Parser.hxx"
 
 #include "SALOME_Launcher_Parser.hxx"
 

diff --git a/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx b/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx
index d847bedfc5172834cea40752b88c6f7197a52e41..1746a0fb06fac0d2b388b023a4331d366e3e4373 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx
@@ -29,7 +29,7 @@
 
 
 #include <SALOMEconfig.h>
-#include <Utils_SALOME_Exception.hxx>
+#include "Utils_SALOME_Exception.hxx"
 
 #include CORBA_CLIENT_HEADER(SALOME_Component)
 

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
index c2d7a825a427cd9e7b332405a25477bc285d9d6b..86585ac9f481de32a90d24e75e4b568ee6e0ae13 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
@@ -35,7 +35,7 @@
 #include <string>
 
 #include <SALOMEconfig.h>
-#include <Utils_SALOME_Exception.hxx>
+#include "Utils_SALOME_Exception.hxx"
 #include CORBA_CLIENT_HEADER(SALOME_ContainerManager)
 #include CORBA_CLIENT_HEADER(SALOME_Component)
 #include <iostream>

diff --git a/src/ParallelContainer/Parallel_Salome_file_i.hxx b/src/ParallelContainer/Parallel_Salome_file_i.hxx
index fa7529ffa10d1e8a34a1cdb4f5c162f7362cc9e6..c1afed41cafe3d78a44c1382785fc46bb619d1cc 100644 (file)
--- a/src/ParallelContainer/Parallel_Salome_file_i.hxx
+++ b/src/ParallelContainer/Parallel_Salome_file_i.hxx
@@ -28,7 +28,7 @@
 #define _PARALLEL_SALOME_FILE_I_HXX_
 
 #include <SALOMEconfig.h>
-#include <SALOME_Container.hxx>
+#include "SALOME_Container.hxx"
 #include <map>
 #include <cstdio>
 

diff --git a/src/SALOMEDS/SALOMEDS.hxx b/src/SALOMEDS/SALOMEDS.hxx
index f2e923cfbeb0f7b36e9eea16ee537445cf5a0d79..8b107eac5628c66cbe1be9380f7ef577a83f8b21 100644 (file)
--- a/src/SALOMEDS/SALOMEDS.hxx
+++ b/src/SALOMEDS/SALOMEDS.hxx
@@ -30,7 +30,7 @@
 
 #include "SALOMEDS_Defines.hxx"
 
-#include <Utils_Mutex.hxx>
+#include "Utils_Mutex.hxx"
 
 namespace SALOMEDS
 {

diff --git a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx
index 8e615018ef13397c95ff48b2235146731b3a0e8c..d7b57fecfa34e0c79040a3bff6be4039fa82dfe6 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx
@@ -31,7 +31,7 @@
 // IDL headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
-#include <DF_Label.hxx>
+#include "DF_Label.hxx"
 
 class SALOMEDS_BasicAttribute_i: public POA_SALOMEDS::BasicAttribute,
                                  public PortableServer::ServantBase {

diff --git a/src/SALOMEDS/SALOMEDS_SObject.hxx b/src/SALOMEDS/SALOMEDS_SObject.hxx
index f4aec27421f3e4313dd136970dbb09815b48b425..f0a16fa6ca6162140043524ae9fb0903c823b4b1 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SObject.hxx
+++ b/src/SALOMEDS/SALOMEDS_SObject.hxx
@@ -29,7 +29,7 @@
 // std C++ headers
 #include <vector>
 
-#include <SALOMEDSClient.hxx>
+#include "SALOMEDSClient.hxx"
 
 // IDL headers
 #include <SALOMEconfig.h>