From d58070fbefb58b6876d69b93a43d246b36645ddc Mon Sep 17 00:00:00 2001 From: adv Date: Wed, 17 Feb 2010 09:46:54 +0000 Subject: [PATCH] Improve build system: install each module's header files to the sub-directory of ${prefix}/include/salome/${module_name} --- idl/Makefile.am | 2 +- salome_adm/unix/Makefile.am | 2 +- salome_adm/unix/config_files/check_Kernel.m4 | 2 +- salome_adm/unix/make_common_starter.am | 4 +++- src/Launcher/Launcher.hxx | 2 +- src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx | 2 +- src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx | 2 +- src/ParallelContainer/Parallel_Salome_file_i.hxx | 2 +- src/SALOMEDS/SALOMEDS.hxx | 2 +- src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_SObject.hxx | 2 +- 11 files changed, 13 insertions(+), 11 deletions(-) diff --git a/idl/Makefile.am b/idl/Makefile.am index 57e246b7f..dc4d168e1 100644 --- 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 c339c22f0..3a01a22c8 100644 --- 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 097424ac3..6e2f40601 100644 --- 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 deb5ea9b3..2597f53c6 100644 --- 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 e3f5dd193..3d6d681a0 100644 --- a/src/Launcher/Launcher.hxx +++ b/src/Launcher/Launcher.hxx @@ -26,7 +26,7 @@ #include "Launcher_Job.hxx" #include "ResourcesManager.hxx" -#include +#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 d847bedfc..1746a0fb0 100644 --- a/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx +++ b/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx @@ -29,7 +29,7 @@ #include -#include +#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 c2d7a825a..86585ac9f 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx @@ -35,7 +35,7 @@ #include #include -#include +#include "Utils_SALOME_Exception.hxx" #include CORBA_CLIENT_HEADER(SALOME_ContainerManager) #include CORBA_CLIENT_HEADER(SALOME_Component) #include diff --git a/src/ParallelContainer/Parallel_Salome_file_i.hxx b/src/ParallelContainer/Parallel_Salome_file_i.hxx index fa7529ffa..c1afed41c 100644 --- 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 -#include +#include "SALOME_Container.hxx" #include #include diff --git a/src/SALOMEDS/SALOMEDS.hxx b/src/SALOMEDS/SALOMEDS.hxx index f2e923cfb..8b107eac5 100644 --- a/src/SALOMEDS/SALOMEDS.hxx +++ b/src/SALOMEDS/SALOMEDS.hxx @@ -30,7 +30,7 @@ #include "SALOMEDS_Defines.hxx" -#include +#include "Utils_Mutex.hxx" namespace SALOMEDS { diff --git a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx index 8e615018e..d7b57fecf 100644 --- a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx +++ b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx @@ -31,7 +31,7 @@ // IDL headers #include #include CORBA_SERVER_HEADER(SALOMEDS) -#include +#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 f4aec2742..f0a16fa6c 100644 --- a/src/SALOMEDS/SALOMEDS_SObject.hxx +++ b/src/SALOMEDS/SALOMEDS_SObject.hxx @@ -29,7 +29,7 @@ // std C++ headers #include -#include +#include "SALOMEDSClient.hxx" // IDL headers #include -- 2.39.2