Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/superv.git] / src / GraphExecutor / Makefile.in

diff --git a/src/GraphExecutor/Makefile.in b/src/GraphExecutor/Makefile.in
index 10707c953561b62b7c75c442b4622248adb8f57f..81151cb65e242e71d842ced837347a13b887f976 100644 (file)
--- a/src/GraphExecutor/Makefile.in
+++ b/src/GraphExecutor/Makefile.in
@@ -1,10 +1,27 @@
+#  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 #==============================================================================
 #  File      : Makefile.in
 #  Created   : aug 21 2001
 #  Author    : , CEA
 #  Project   : SALOME
-#  Copyright : CEA 2001
-#  $Header: 
 #==============================================================================
 
 # source path
@@ -38,20 +55,24 @@ LIB_CLIENT_IDL = SALOME_ModuleCatalog.idl \
                   SALOME_Component.idl \
                   SALOMEDS.idl \
                   SUPERV.idl  \
-                  SALOME_Exception.idl
+                  SALOME_Exception.idl \
+                 SALOME_GenericObj.idl
 
 # Executables targets
 #BIN = SuperVisionExecutor_CheckOfUndefined
 BIN_SRC = 
 BIN_SERVER_IDL = 
 
-CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
 CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
-       -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS+= -export-dynamic -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lSalomeSuperVisionEditor -lOpUtil -lSALOMELocalTrace -lCASCatch\
-       -lc $(QT_MT_LIBS) $(OGL_LIBS) \
-       -L${KERNEL_ROOT_DIR}/lib/salome
+       $(KERNEL_CXXFLAGS)
+
+ifeq ($(OS),REDHAT)
+       CXXFLAGS+= -DREDHAT
+endif
+
+LDFLAGS+= -export-dynamic -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lSalomeSuperVisionEditor -lOpUtil -lSALOMELocalTrace\
+       -lc $(QT_MT_LIBS) $(KERNEL_LDFLAGS)
 #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)