NRI : wrong merge.

diff --git a/src/GraphBase/Makefile.in b/src/GraphBase/Makefile.in
index 22235eabfb1656b5fb7ca71f803a6d38c02d979c..17aec826f96f1732028256044045f72efb73b7ac 100644 (file)
--- a/src/GraphBase/Makefile.in
+++ b/src/GraphBase/Makefile.in
@@ -95,7 +95,7 @@ CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES)
 #CXXFLAGS= -g -D_DEBUG_ -D__x86__ -D__linux__ -ftemplate-depth-42
 CXXFLAGS= -g -D_DEBUG_ -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
        -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS= -L../../lib/salome $(CORBA_LIBS) -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSalomeLoggerServer \
+LDFLAGS= -L../../lib/salome $(CORBA_LIBS) -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace \
        -lc $(PYTHON_LIBS) $(QT_MT_LIBS) $(OGL_LIBS) \
        -L${KERNEL_ROOT_DIR}/lib/salome
 #LDFLAGS= -L../../../lib $(CORBA_LIBS) -lomniORB4 -lomniDynamic4 -lomnithread -lCOS4 -lCOSDynamic4 -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSalomeLoggerServer -lc $(QT_MT_LIBS)

diff --git a/src/GraphEditor/Makefile.in b/src/GraphEditor/Makefile.in
index 5a5bfd7bf011cc6eae7a006e730d1902c64850cc..d1acd912fc907fedaccf60251b5bb9cfc14a457f 100644 (file)
--- a/src/GraphEditor/Makefile.in
+++ b/src/GraphEditor/Makefile.in
@@ -64,7 +64,7 @@ CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES)
 CXXFLAGS= -g -D_DEBUG_ -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
        -I${KERNEL_ROOT_DIR}/include/salome
 #LDFLAGS+= -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lSalomeSuperVisionExecutor -lOpUtil -lSalomeLoggerServer -lc $(PYTHON_LIBS) $(QT_MT_LIBS) $(OGL_LIBS)
-LDFLAGS+= -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lSalomeSuperVisionExecutor -lOpUtil -lSalomeLoggerServer \
+LDFLAGS+= -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lSalomeSuperVisionExecutor -lOpUtil -lSALOMELocalTrace \
        -lc $(QT_MT_LIBS) $(OGL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
 
 

diff --git a/src/GraphExecutor/Makefile.in b/src/GraphExecutor/Makefile.in
index e843b1fba134b5991471d1ab770c91bbce78c49f..6582602e8d8cd4412efda935dc5437ed919e3f24 100644 (file)
--- a/src/GraphExecutor/Makefile.in
+++ b/src/GraphExecutor/Makefile.in
@@ -51,7 +51,7 @@ CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES)
 CXXFLAGS= -g -D_DEBUG_ -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
        -I${KERNEL_ROOT_DIR}/include/salome
 #LDFLAGS+= -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lOpUtil -lSalomeLoggerServer -lc $(PYTHON_LIBS) $(QT_MT_LIBS) $(OGL_LIBS)
-LDFLAGS+= -export-dynamic -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lOpUtil -lSalomeLoggerServer \
+LDFLAGS+= -export-dynamic -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lOpUtil -lSALOMELocalTrace \
        -lc $(QT_MT_LIBS) $(OGL_LIBS) \
        -L${KERNEL_ROOT_DIR}/lib/salome
 

diff --git a/src/Supervision/Makefile.in b/src/Supervision/Makefile.in
index 1f2b942e920d011fb1900e98b8524205fb5820b1..341019d5622c0a53c54924f2177a5cdd827a77fb 100755 (executable)
--- a/src/Supervision/Makefile.in
+++ b/src/Supervision/Makefile.in
@@ -89,7 +89,7 @@ CXXFLAGS += -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
        -I${KERNEL_ROOT_DIR}/include/salome
 LDFLAGS+= -lSalomeSuperVisionEditor -lSalomeSuperVisionExecutor -lSalomeSuperVisionBase \
        -lSalomeContainer -lSalomeNotification -lSalomeNS -lSalomeLifeCycleCORBA \
-       -lOpUtil -lRegistry -lTOOLSDS -lSalomeLoggerServer \
+       -lOpUtil -lRegistry -lTOOLSDS -lSALOMELocalTrace \
        $(QT_MT_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
 
 @CONCLUDE@