From: prascle <prascle>
Date: Wed, 1 Feb 2006 15:09:33 +0000 (+0000)
Subject: PR: remove SALOMETraceCollector dependance
X-Git-Tag: BR_auto_V310__v_0_2~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=99c602ad4f93984c274f7b768c2f56c76cf708a1;p=modules%2Fkernel.git

PR: remove SALOMETraceCollector dependance
---

diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx
index a97bb39dc..d7c62076e 100644
--- a/src/Container/SALOME_Container.cxx
+++ b/src/Container/SALOME_Container.cxx
@@ -43,7 +43,6 @@
 #include "utilities.h"
 #include "Utils_ORB_INIT.hxx"
 #include "Utils_SINGLETON.hxx"
-#include "SALOMETraceCollector.hxx"
 #include "OpUtil.hxx"
 
 #ifdef CHECKTIME
diff --git a/src/Container/SALOME_ContainerManagerServer.cxx b/src/Container/SALOME_ContainerManagerServer.cxx
index 5d3f13102..d6f421608 100644
--- a/src/Container/SALOME_ContainerManagerServer.cxx
+++ b/src/Container/SALOME_ContainerManagerServer.cxx
@@ -18,7 +18,6 @@
 // See http://www.salome-platform.org/
 //
 #include "SALOME_ContainerManager.hxx"
-#include "SALOMETraceCollector.hxx"
 #include "utilities.h"
 
 int main(int argc, char* argv[])
diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index 439d10fb5..f5d7d6fc3 100644
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@ -38,7 +38,6 @@
 #include <ServiceUnreachable.hxx>
 
 #include "SALOME_LifeCycleCORBA.hxx"
-#include "SALOMETraceCollector.hxx"
 #ifndef WNT
 #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
 #else
diff --git a/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx
index 050cd194d..d4247492d 100644
--- a/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx
@@ -41,7 +41,6 @@
 #include "SALOME_NamingService.hxx"
 #include "SALOME_LifeCycleCORBA.hxx"
 #include "utilities.h"
-#include "SALOMETraceCollector.hxx"
 #include <OpUtil.hxx>
 
 using namespace std;
diff --git a/src/MPIContainer/SALOME_MPIContainer.cxx b/src/MPIContainer/SALOME_MPIContainer.cxx
index 615f27f84..f8692c65f 100644
--- a/src/MPIContainer/SALOME_MPIContainer.cxx
+++ b/src/MPIContainer/SALOME_MPIContainer.cxx
@@ -23,7 +23,6 @@
 #include "Utils_ORB_INIT.hxx"
 #include "Utils_SINGLETON.hxx"
 #include "utilities.h"
-#include "SALOMETraceCollector.hxx"
 using namespace std;
 
 int main(int argc, char* argv[])
diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am
index cf7900b14..45678c79f 100644
--- a/src/ModuleCatalog/Makefile.am
+++ b/src/ModuleCatalog/Makefile.am
@@ -105,8 +105,7 @@ bin_PROGRAMS = SALOME_ModuleCatalog_Server SALOME_ModuleCatalog_Client
 # SALOME_ModuleCatalog_Server
 SALOME_ModuleCatalog_Server_SOURCES  = SALOME_ModuleCatalog_Server.cxx
 SALOME_ModuleCatalog_Server_CPPFLAGS =\
-	$(COMMON_CPPFLAGS) \
-	-I$(srcdir)/../SALOMETraceCollector
+	$(COMMON_CPPFLAGS) 
 
 SALOME_ModuleCatalog_Server_LDADD   =\
 	libSalomeCatalog.la \
diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
index 274de28a1..f01ba2d1e 100644
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
@@ -29,7 +29,6 @@
 #include "SALOME_NamingService.hxx"
 #include "SALOME_ModuleCatalog_impl.hxx"
 #include "utilities.h"
-#include "SALOMETraceCollector.hxx"
 #include "Utils_SINGLETON.hxx"
 
 #ifdef CHECKTIME
diff --git a/src/Registry/Makefile.am b/src/Registry/Makefile.am
index 83158a3e1..6698f9d3a 100644
--- a/src/Registry/Makefile.am
+++ b/src/Registry/Makefile.am
@@ -74,5 +74,4 @@ SALOME_Registry_Server_CPPFLAGS =\
 	-I$(srcdir)/../Utils \
 	-I$(top_builddir)/salome_adm/unix \
 	-I$(top_builddir)/idl \
-	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \
-	-I$(srcdir)/../SALOMETraceCollector
+	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@
diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx
index 0131bb901..2ee59f649 100644
--- a/src/Registry/SALOME_Registry_Server.cxx
+++ b/src/Registry/SALOME_Registry_Server.cxx
@@ -36,7 +36,6 @@ extern "C"
 }
 
 #include "utilities.h"
-#include "SALOMETraceCollector.hxx"
 #include "Utils_ORB_INIT.hxx"
 #include "Utils_SINGLETON.hxx"
 #include "Utils_SALOME_Exception.hxx"
diff --git a/src/TestContainer/Makefile.am b/src/TestContainer/Makefile.am
index 0a06489e0..6ad0c10ea 100644
--- a/src/TestContainer/Makefile.am
+++ b/src/TestContainer/Makefile.am
@@ -48,7 +48,6 @@ salomescript_DATA = SALOME_TestComponentPy.py TestComponentPy.py
 COMMON_CPPFLAGS=\
 	-I$(srcdir)/../Basics \
 	-I$(srcdir)/../SALOMELocalTrace \
-	-I$(srcdir)/../SALOMETraceCollector \
 	-I$(srcdir)/../NamingService \
 	-I$(srcdir)/../Utils \
 	-I$(srcdir)/../Registry \
diff --git a/src/TestContainer/TestContainer.cxx b/src/TestContainer/TestContainer.cxx
index de2de52a0..06b543ea7 100644
--- a/src/TestContainer/TestContainer.cxx
+++ b/src/TestContainer/TestContainer.cxx
@@ -40,7 +40,6 @@
 #include "Utils_SINGLETON.hxx"
 #include "Utils_SALOME_Exception.hxx"
 #include "Utils_CommException.hxx"
-#include "SALOMETraceCollector.hxx"
 using namespace std;
 
 static ostream& operator<<(ostream& os, const CORBA::Exception& e)
diff --git a/src/TestMPIContainer/TestMPIContainer.cxx b/src/TestMPIContainer/TestMPIContainer.cxx
index 8c7e80a1f..dfe3b7f81 100644
--- a/src/TestMPIContainer/TestMPIContainer.cxx
+++ b/src/TestMPIContainer/TestMPIContainer.cxx
@@ -39,7 +39,6 @@
 # include "Utils_SINGLETON.hxx"
 #include "SALOME_NamingService.hxx"
 #include "OpUtil.hxx"
-#include "SALOMETraceCollector.hxx"
 using namespace std;
 
 int main (int argc, char * argv[])