Join modifications from branch OCC_debug_for_3_2_0b1

[modules/visu.git] / src / CONVERTOR / Makefile.in

diff --git a/src/CONVERTOR/Makefile.in b/src/CONVERTOR/Makefile.in
index b3bf4147137e221337642361636ea97c7e894ee5..56481d8447825a13583913762f82de653fdc82e8 100644 (file)
--- a/src/CONVERTOR/Makefile.in
+++ b/src/CONVERTOR/Makefile.in
@@ -63,9 +63,9 @@ CPPFLAGS+= -ftemplate-depth-32 \
        $(QT_INCLUDES) \
        $(OCC_INCLUDES) \
        $(OCC_CXXFLAGS) \
-       -I${KERNEL_ROOT_DIR}/include/salome \
-       -I${MED_ROOT_DIR}/include/salome \
-       -I${GUI_ROOT_DIR}/include/salome \
+       $(KERNEL_CXXFLAGS) \
+       $(MED_CXXFLAGS) \
+       $(GUI_CXXFLAGS) \
        $(BOOST_CPPFLAGS)
 
 LDFLAGS+= $(VTK_LIBS) \
@@ -73,8 +73,8 @@ LDFLAGS+= $(VTK_LIBS) \
        $(CAS_KERNEL) \
        $(CAS_MATH) \
        $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \
-       -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper \
-       -L${GUI_ROOT_DIR}/lib/salome -lVTKViewer
+       $(MED_LDFLAGS) -lMEDWrapper \
+       $(GUI_LDFLAGS) -lVTKViewer
 
 LDFLAGSFORBIN=$(LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lmed_V2_1 -lVTKViewer -lsuit -lqtx