Fix compilation problems on Debian(OCC instaed CAS) and Mandriva64(CORBA CPPFLAGS)

diff --git a/src/SMESHFiltersSelection/Makefile.am b/src/SMESHFiltersSelection/Makefile.am
index 192973966f7f0d94f48037970c2808b97e558b56..9d5d0ba93215423c227261446952ecd517c2a28d 100644 (file)
--- a/src/SMESHFiltersSelection/Makefile.am
+++ b/src/SMESHFiltersSelection/Makefile.am
@@ -56,6 +56,8 @@ libSMESHFiltersSelection_la_CPPFLAGS = \
        $(PYTHON_INCLUDES) \
        $(VTK_INCLUDES) \
        ${BOOST_CPPFLAGS} \
+       $(CORBA_CXXFLAGS) \
+       $(CORBA_INCLUDES) \
        -I$(top_builddir)/idl \
        -I$(top_builddir)/salome_adm/unix
 
@@ -64,5 +66,4 @@ libSMESHFiltersSelection_la_LDFLAGS  = \
        $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \
        $(GUI_LDFLAGS) -lSalomeApp -lsuit \
        $(GEOM_LDFLAGS) -lGEOM \
-       $(OCC_KERNEL_LIBS)
-
+       $(CAS_LDPATH) -lTKernel

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index 42cb6e927e20ab63086b9426511d7aa3b79dfba0..d05ea4dbb770731456ebee0a2a3858019eb80ba5 100644 (file)
--- a/src/StdMeshers/Makefile.am
+++ b/src/StdMeshers/Makefile.am
@@ -124,4 +124,4 @@ libStdMeshers_la_LDFLAGS  = \
        ../SMESHDS/libSMESHDS.la \
        ../MEFISTO2/libMEFISTO2D.la \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lOpUtil \
-       $(OCC_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d
+       $(CAS_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d

diff --git a/src/StdMeshersGUI/Makefile.am b/src/StdMeshersGUI/Makefile.am
index 76f0ab19b77e12dd4e6f428829a65330b4df95a0..aaa37f91feb46c5d766abdd981a60982f16c8386 100644 (file)
--- a/src/StdMeshersGUI/Makefile.am
+++ b/src/StdMeshersGUI/Makefile.am
@@ -86,7 +86,7 @@ libStdMeshersGUI_la_LDFLAGS  = \
        ../SMESHGUI/libSMESH.la \
        ../OBJECT/libSMESHObject.la \
        $(GUI_LDFLAGS) -lSalomeApp \
-       $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools \
+       $(CAS_LDPATH) -lTKernel -lTKBO -lTKAdvTools \
        $(QWT_LIBS)
 
 # resources files