Join modifications from branch BR_DEBUG_3_2_0b1

[modules/geom.git] / src / GEOMBase / Makefile.in

diff --git a/src/GEOMBase/Makefile.in b/src/GEOMBase/Makefile.in
index 260845ed6a1514ee1c5066461d86a57763dd7ed8..070f919454ad18dec73e1619acbcfabdb679fe13 100644 (file)
--- a/src/GEOMBase/Makefile.in
+++ b/src/GEOMBase/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
 #
 #
 #
@@ -63,9 +63,9 @@ LIB_SERVER_IDL =
 
 # additionnal information to compil and link file
 
-CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
-CXXFLAGS += $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
+CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
+CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
 
-LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim
+LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim
 
 @CONCLUDE@