Join modifications from branch BR_DEBUG_3_2_0b1

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

diff --git a/src/StdMeshersGUI/Makefile.in b/src/StdMeshersGUI/Makefile.in
index 8cb95b44a9caad3f70ff795ae9313513537fcbf0..5d7689351db037e037b905bee0f3cd699072625f 100644 (file)
--- a/src/StdMeshersGUI/Makefile.in
+++ b/src/StdMeshersGUI/Makefile.in
@@ -16,7 +16,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.salome-platform.org or email : webmaster.salome@opencascade.org
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
@@ -62,12 +62,12 @@ LIB_CLIENT_IDL = \
 
 ## pb in dependencies search
 LIB_CLIENT_IDL += \
+       SALOME_Comm.idl \
        SALOMEDS.idl \
        SALOME_GenericObj.idl \
        SALOME_ContainerManager.idl \
        SALOME_Component.idl \
        GEOM_Gen.idl \
-       SALOME_Comm.idl \
        MED.idl
 
 LIB_SERVER_IDL = 
@@ -75,13 +75,13 @@ LIB_SERVER_IDL =
 # additionnal information to compil and link file
 
 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \
-            -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome \
+            $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS) \
             $(BOOST_CPPFLAGS) $(QWT_INCLUDES)
 
-CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
+CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS)
 
 LDFLAGS += -lSMESH -lVTKViewer -lSalomeApp -lSMESHObject -lSMESHFiltersSelection $(OCC_KERNEL_LIBS) \
-         -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome \
+         -lTKBO $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(GUI_LDFLAGS) \
          $(QWT_LIBS)
 
 @CONCLUDE@