fix linux compilation

diff --git a/src/SALOMELocalTrace/BaseTraceCollector.hxx b/src/SALOMELocalTrace/BaseTraceCollector.hxx
index 63245131fa42cbff8986c8e7f24cd83d53108123..af3fbc06d9c45d532c62509d3e1784c86b6935cc 100644 (file)
--- a/src/SALOMELocalTrace/BaseTraceCollector.hxx
+++ b/src/SALOMELocalTrace/BaseTraceCollector.hxx
@@ -27,7 +27,7 @@
 #ifndef _BASETRACECOLLECTOR_HXX_
 #define _BASETRACECOLLECTOR_HXX_
 
-#include <SALOME_LocalTrace.hxx>
+#include "SALOME_LocalTrace.hxx"
 
 #include <pthread.h>
 #include <semaphore.h>

diff --git a/src/SALOMELocalTrace/FileTraceCollector.hxx b/src/SALOMELocalTrace/FileTraceCollector.hxx
index b4222d7c32a8e28aa4dcf659687673a33040f03c..96a503d7bb61f3c66dab0d44c887dde3892ceb5d 100644 (file)
--- a/src/SALOMELocalTrace/FileTraceCollector.hxx
+++ b/src/SALOMELocalTrace/FileTraceCollector.hxx
@@ -27,7 +27,7 @@
 #ifndef _FILETRACECOLLECTOR_HXX_
 #define _FILETRACECOLLECTOR_HXX_
 
-#include <SALOME_LocalTrace.hxx>
+#include "SALOME_LocalTrace.hxx"
 
 #include <string>
 #include "LocalTraceBufferPool.hxx"

diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.hxx b/src/SALOMELocalTrace/LocalTraceBufferPool.hxx
index 2ca600be352ecbbeb8699109c266c6c54afd8383..b439cc54afcc4861994e36c1e52e86c4ebef03b3 100644 (file)
--- a/src/SALOMELocalTrace/LocalTraceBufferPool.hxx
+++ b/src/SALOMELocalTrace/LocalTraceBufferPool.hxx
@@ -24,7 +24,7 @@
 #ifndef _LOCALTRACEBUFFERPOOL_HXX_
 #define _LOCALTRACEBUFFERPOOL_HXX_
 
-#include <SALOME_LocalTrace.hxx>
+#include "SALOME_LocalTrace.hxx"
 
 #define TRACE_BUFFER_SIZE 256  // number of entries in circular buffer
                                // must be power of 2

diff --git a/src/SALOMELocalTrace/LocalTraceCollector.hxx b/src/SALOMELocalTrace/LocalTraceCollector.hxx
index 52b2b323d9c333a75c9c4ebe3cff34aa18b1d0ec..cc9681f8a1fcdd06c102bb4a76d62571aee8b619 100644 (file)
--- a/src/SALOMELocalTrace/LocalTraceCollector.hxx
+++ b/src/SALOMELocalTrace/LocalTraceCollector.hxx
@@ -27,7 +27,7 @@
 #ifndef _LOCALTRACECOLLECTOR_HXX_
 #define _LOCALTRACECOLLECTOR_HXX_
 
-#include <SALOME_LocalTrace.hxx>
+#include "SALOME_LocalTrace.hxx"
 
 #include <string>
 #include "LocalTraceBufferPool.hxx"

diff --git a/src/SALOMELocalTrace/Makefile.am b/src/SALOMELocalTrace/Makefile.am
index 058426d1d246eb23d5ab28444b953a6790574e3c..f499942116ee0178084d0ddd006ad100f1a3990c 100644 (file)
--- a/src/SALOMELocalTrace/Makefile.am
+++ b/src/SALOMELocalTrace/Makefile.am
@@ -31,7 +31,8 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 salomeinclude_HEADERS = \
        utilities.h \
        LocalTraceBufferPool.hxx \
-       BaseTraceCollector.hxx
+       BaseTraceCollector.hxx \
+       SALOME_LocalTrace.hxx
 
 lib_LTLIBRARIES = libSALOMELocalTrace.la
 

diff --git a/src/SALOMELocalTrace/Makefile.in b/src/SALOMELocalTrace/Makefile.in
deleted file mode 100644 (file)
index 0856037..0000000
--- a/src/SALOMELocalTrace/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#  SALOMELocalTrace : log on local machine
-#
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU Lesser General Public 
-#  License as published by the Free Software Foundation; either 
-#  version 2.1 of the License. 
-# 
-#  This library is distributed in the hope that it will be useful, 
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#  Lesser General Public License for more details. 
-# 
-#  You should have received a copy of the GNU Lesser General Public 
-#  License along with this library; if not, write to the Free Software 
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-#
-#
-#
-#  File   : Makefile.in
-#  Author : Paul RASCLE (EDF)
-#  Module : SALOME
-#  $Header$
-
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
-
-
-@COMMENCE@
-
-# header files  
-EXPORT_HEADERS= utilities.h \
-               LocalTraceBufferPool.hxx \
-               BaseTraceCollector.hxx \
-               SALOME_LocalTrace.hxx
-
-EXPORT_PYSCRIPTS = 
-
-# Libraries targets
-
-LIB = libSALOMELocalTrace.la 
-LIB_SRC = BaseTraceCollector.cxx \
-         LocalTraceCollector.cxx \
-         FileTraceCollector.cxx \
-         LocalTraceBufferPool.cxx
-
-LIBS= @LIBS@ 
-LDFLAGS+= -lSALOMEBasics
-
-
-@CONCLUDE@