Join modifications from branch BR_DEBUG_3_2_0b1

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

diff --git a/src/Supervision/Makefile.in b/src/Supervision/Makefile.in
index b2267442cbd38dc4d29a6e2a439e9556acbab1da..a60c80edf96bb0cf96653e185e012be3036abd7d 100755 (executable)
--- a/src/Supervision/Makefile.in
+++ b/src/Supervision/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
 #
 #
 #
@@ -89,16 +89,16 @@ BIN_SRC =
 BIN_SERVER_IDL = 
 
 CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS)\
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS)
 CXXFLAGS += -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
-       -I${KERNEL_ROOT_DIR}/include/salome -L$(top_builddir)/lib/salome
+       $(KERNEL_CXXFLAGS) $(SUPERV_LDFLAGS)
 LDFLAGS+= -lSalomeSuperVisionEditor -lSalomeSuperVisionExecutor -lSalomeSuperVisionBase \
        -lSalomeContainer -lSalomeNotification -lSalomeNS -lSalomeLifeCycleCORBA \
        -lOpUtil -lRegistry -lTOOLSDS -lSALOMELocalTrace \
-       $(QT_MT_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
+       $(QT_MT_LIBS) $(KERNEL_LDFLAGS)
 #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 
-LDFLAGSFORBIN += $(LDFLAGS) -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeResourcesManager -lSALOMEBasics
+LDFLAGSFORBIN += $(LDFLAGS) $(KERNEL_LDFLAGS) -lSalomeResourcesManager -lSALOMEBasics
 #LIBSFORBIN += $(LIBS)
 
 @CONCLUDE@