Join modifications from branch BR_DEBUG_3_2_0b1

[modules/smesh.git] / src / SMESH_SWIG / Makefile.in

diff --git a/src/SMESH_SWIG/Makefile.in b/src/SMESH_SWIG/Makefile.in
index f0ba6eec1ef35570742c736d0b5c5a69200875de..ce5a54fd30c2693041ade5d9bcf17b8b7ff8d9a7 100644 (file)
--- a/src/SMESH_SWIG/Makefile.in
+++ b/src/SMESH_SWIG/Makefile.in
@@ -15,7 +15,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 
 # 
 #  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

 #
 #
 #
 #
 #
 #


@@ -115,8 +115,8 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
 
 EXPORT_SHAREDPYSCRIPTS=SMESH_shared_modules.py
 
 
 EXPORT_SHAREDPYSCRIPTS=SMESH_shared_modules.py
 

-CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -DHAVE_CONFIG_H
+CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H

 LIBS+= $(PYTHON_LIBS)
 LIBS+= $(PYTHON_LIBS)

-LDFLAGS+= -lSMESH -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeGenericObj
+LDFLAGS+= -lSMESH $(KERNEL_LDFLAGS) -lSalomeGenericObj

 
 @CONCLUDE@
 
 @CONCLUDE@