From 6a6f45f7332193ca326a4a67542e9fd15bb36c6b Mon Sep 17 00:00:00 2001 From: abd Date: Tue, 15 Aug 2006 13:20:12 +0000 Subject: [PATCH] fix linux compilation --- src/SALOMELocalTrace/BaseTraceCollector.hxx | 2 +- src/SALOMELocalTrace/FileTraceCollector.hxx | 2 +- src/SALOMELocalTrace/LocalTraceBufferPool.hxx | 2 +- src/SALOMELocalTrace/LocalTraceCollector.hxx | 2 +- src/SALOMELocalTrace/Makefile.am | 3 +- src/SALOMELocalTrace/Makefile.in | 57 ------------------- 6 files changed, 6 insertions(+), 62 deletions(-) delete mode 100644 src/SALOMELocalTrace/Makefile.in diff --git a/src/SALOMELocalTrace/BaseTraceCollector.hxx b/src/SALOMELocalTrace/BaseTraceCollector.hxx index 63245131f..af3fbc06d 100644 --- a/src/SALOMELocalTrace/BaseTraceCollector.hxx +++ b/src/SALOMELocalTrace/BaseTraceCollector.hxx @@ -27,7 +27,7 @@ #ifndef _BASETRACECOLLECTOR_HXX_ #define _BASETRACECOLLECTOR_HXX_ -#include +#include "SALOME_LocalTrace.hxx" #include #include diff --git a/src/SALOMELocalTrace/FileTraceCollector.hxx b/src/SALOMELocalTrace/FileTraceCollector.hxx index b4222d7c3..96a503d7b 100644 --- a/src/SALOMELocalTrace/FileTraceCollector.hxx +++ b/src/SALOMELocalTrace/FileTraceCollector.hxx @@ -27,7 +27,7 @@ #ifndef _FILETRACECOLLECTOR_HXX_ #define _FILETRACECOLLECTOR_HXX_ -#include +#include "SALOME_LocalTrace.hxx" #include #include "LocalTraceBufferPool.hxx" diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.hxx b/src/SALOMELocalTrace/LocalTraceBufferPool.hxx index 2ca600be3..b439cc54a 100644 --- a/src/SALOMELocalTrace/LocalTraceBufferPool.hxx +++ b/src/SALOMELocalTrace/LocalTraceBufferPool.hxx @@ -24,7 +24,7 @@ #ifndef _LOCALTRACEBUFFERPOOL_HXX_ #define _LOCALTRACEBUFFERPOOL_HXX_ -#include +#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 52b2b323d..cc9681f8a 100644 --- a/src/SALOMELocalTrace/LocalTraceCollector.hxx +++ b/src/SALOMELocalTrace/LocalTraceCollector.hxx @@ -27,7 +27,7 @@ #ifndef _LOCALTRACECOLLECTOR_HXX_ #define _LOCALTRACECOLLECTOR_HXX_ -#include +#include "SALOME_LocalTrace.hxx" #include #include "LocalTraceBufferPool.hxx" diff --git a/src/SALOMELocalTrace/Makefile.am b/src/SALOMELocalTrace/Makefile.am index 058426d1d..f49994211 100644 --- 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 index 0856037a7..000000000 --- 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@ -- 2.39.2