Join modifications from branch BR_DEBUG_3_2_0b1

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

diff --git a/src/GraphBase/Makefile.in b/src/GraphBase/Makefile.in
index c61a47a955b8ebc989b80253cd23910472adbd51..7e28c7f79fd342838aad7d908d1572ccf8bcf42b 100644 (file)
--- a/src/GraphBase/Makefile.in
+++ b/src/GraphBase/Makefile.in
@@ -17,7 +17,7 @@
 #  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 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
@@ -30,34 +30,34 @@ top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
-
+# KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@
 
 @COMMENCE@
 
 EXPORT_HEADERS = \
-               DataFlowBase_Base.hxx \
-               DataFlowBase_ServicesParameter.hxx \
-               DataFlowBase_Port.hxx \
-               DataFlowBase_DataPort.hxx \
-               DataFlowBase_InPort.hxx \
-               DataFlowBase_InDataStreamPort.hxx \
-               DataFlowBase_OutPort.hxx \
-               DataFlowBase_OutDataStreamPort.hxx \
-               DataFlowBase_Service.hxx \
-               DataFlowBase_PortsOfNode.hxx \
-               DataFlowBase_StreamNode.hxx \
-               DataFlowBase_ComputingNode.hxx \
-               DataFlowBase_FactoryNode.hxx \
-               DataFlowBase_InLineNode.hxx \
-               DataFlowBase_GOTONode.hxx \
-               DataFlowBase_LoopNode.hxx \
-               DataFlowBase_EndOfLoopNode.hxx \
-               DataFlowBase_SwitchNode.hxx \
-               DataFlowBase_EndOfSwitchNode.hxx \
-               DataFlowBase_DataNode.hxx \
-               DataFlowBase_XmlHandler.hxx \
-               DataFlowBase_Graph.hxx \
-               DataFlowBase_StreamGraph.hxx
+       DataFlowBase_Base.hxx \
+       DataFlowBase_ServicesParameter.hxx \
+       DataFlowBase_Port.hxx \
+       DataFlowBase_DataPort.hxx \
+       DataFlowBase_InPort.hxx \
+       DataFlowBase_InDataStreamPort.hxx \
+       DataFlowBase_OutPort.hxx \
+       DataFlowBase_OutDataStreamPort.hxx \
+       DataFlowBase_Service.hxx \
+       DataFlowBase_PortsOfNode.hxx \
+       DataFlowBase_StreamNode.hxx \
+       DataFlowBase_ComputingNode.hxx \
+       DataFlowBase_FactoryNode.hxx \
+       DataFlowBase_InLineNode.hxx \
+       DataFlowBase_GOTONode.hxx \
+       DataFlowBase_LoopNode.hxx \
+       DataFlowBase_EndOfLoopNode.hxx \
+       DataFlowBase_SwitchNode.hxx \
+       DataFlowBase_EndOfSwitchNode.hxx \
+       DataFlowBase_DataNode.hxx \
+       DataFlowBase_XmlHandler.hxx \
+       DataFlowBase_Graph.hxx \
+       DataFlowBase_StreamGraph.hxx
 
 # Libraries targets
 LIB = libSalomeSuperVisionBase.la
@@ -87,25 +87,25 @@ LIB_SRC = \
        DataFlowBase_StreamGraph.cxx
 
 LIB_CLIENT_IDL = Logger.idl \
-                SALOME_ModuleCatalog.idl \
-                SALOME_Component.idl \
-                SALOMEDS.idl \
-                SUPERV.idl \
-                SALOMEDS_Attributes.idl \
-                SALOME_Exception.idl \
-                SALOME_GenericObj.idl
+       SALOME_ModuleCatalog.idl \
+       SALOME_Component.idl \
+       SALOMEDS.idl \
+       SUPERV.idl \
+       SALOMEDS_Attributes.idl \
+       SALOME_Exception.idl \
+       SALOME_GenericObj.idl
 # Executables targets
 BIN = SuperVisionBase_CheckOfUndefined
 BIN_SRC = 
 BIN_SERVER_IDL = 
 
 CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS)
 CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
-       -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS= -L../../lib/salome $(CORBA_LIBS) -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace \
+       $(KERNEL_CXXFLAGS)
+LDFLAGS+= $(SUPERV_LDFLAGS) $(CORBA_LIBS) -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace \
        -lc $(PYTHON_LIBS) $(QT_MT_LIBS) $(OGL_LIBS) \
-       -L${KERNEL_ROOT_DIR}/lib/salome
+       $(KERNEL_LDFLAGS)
 LDFLAGSFORBIN=$(LDFLAGS) -lSalomeContainer -lSalomeResourcesManager -lRegistry -lSalomeNotification -lSALOMEBasics
 //LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)