NRI : Merge from V1_2.

diff --git a/src/SUPERVGUI/Makefile.in b/src/SUPERVGUI/Makefile.in
index 05b92bd8b3db2cc85851624fb13d2be7996577bc..fe3d75b03a7422cd7492b2f880b22f58d698264a 100644 (file)
--- a/src/SUPERVGUI/Makefile.in
+++ b/src/SUPERVGUI/Makefile.in
@@ -1,15 +1,33 @@
-##==============================================================================
-#  File      : Makefile.in
-#  Created   : aug  29 16:50:13 CEA 2001
-#  Author    : Arnaud RES, OPENCASCADE
-#  Project   : SALOME
-#  Copyright : CEA 2001
+#  SUPERV SUPERVGUI : GUI for Supervisor component
+#
+#  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 : Arnaud RES, OPENCASCADE
+#  Module : SUPERV
 #  $Header: 
-#==============================================================================
 
-# source path
 top_srcdir=@top_srcdir@
-top_builddir=../..
+top_builddir=../../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
 
@@ -27,7 +45,7 @@ PO_FILES = \
 
 # Libraries targets
 
-LIB = libSUPERVGUI.la
+LIB = libSupervisionGUI.la
 
 LIB_SRC = SUPERVGUI.cxx              \
          SUPERVGUI_Service.cxx      \
@@ -75,11 +93,10 @@ LIB_CLIENT_IDL = SALOMEDS.idl             \
 LIB_SERVER_IDL = 
 
 CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) \
-         -ftemplate-depth-42 -I${KERNEL_ROOT_DIR}/include/salome
+         -I$(top_builddir)/inc -ftemplate-depth-42
 LDFLAGS+=$(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) $(OGL_LIBS) \
-        -lSalomeGUI -lSalomeNS -lqsplitterP \
-        -lSalomeLifeCycleCORBA -lSalomeNotification -lSUPERVGraph \
-        -L${KERNEL_ROOT_DIR}/lib/salome
+        -L$(top_builddir)/lib  -lSalomeGUI -lSalomeNS -lqsplitterP \
+        -lSalomeLifeCycleCORBA -lSalomeNotification -lSUPERVGraph
 
 LIBS+= $(PYTHON_LIBS)