PAL13190 (EDF159 SMESH: in Merge Nodes and Merge Elements, visualisze nodes or meshes...

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

diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in
index f600730c8b9b797b462416b9069c7a7e8ac91ca9..821ca6f91868eee1e66d70887c2416fe554f7708 100644 (file)
--- a/src/SMESHGUI/Makefile.in
+++ b/src/SMESHGUI/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
 #
 #
 #
@@ -42,7 +42,9 @@ EXPORT_HEADERS= SMESHGUI_Swig.hxx \
                SMESHGUI_Hypotheses.h \
                SMESHGUI_HypothesesUtils.h \
                SMESHGUI_SpinBox.h \
-               SMESHGUI_Selection.h 
+               SMESHGUI_Selection.h \
+               SMESHGUI_VTKUtils.h
+
 
 # .po files to transform in .qm
 PO_FILES = \
@@ -89,6 +91,7 @@ LIB_SRC =     SMESHGUI.cxx \
                SMESHGUI_SewingDlg.cxx \
                SMESHGUI_MergeNodesDlg.cxx \
                SMESHGUI_EditMeshDlg.cxx \
+               SMESHGUI_BuildCompoundDlg.cxx \
                SMESHGUI_Utils.cxx \
                SMESHGUI_GEOMGenUtils.cxx \
                SMESHGUI_MeshUtils.cxx \
@@ -109,7 +112,9 @@ LIB_SRC =   SMESHGUI.cxx \
                SMESHGUI_ShapeByMeshDlg.cxx \
                SMESHGUI_AddQuadraticElementDlg.cxx \
                SMESHGUI_ConvToQuadDlg.cxx \
-               SMESHGUI_ConvToQuadOp.cxx
+               SMESHGUI_ConvToQuadOp.cxx \
+               SMESHGUI_MeshEditPreview.cxx \
+               SMESHGUI_MakeNodeAtPointDlg.cxx
 
 LIB_MOC = \
                SMESHGUI.h \
@@ -147,6 +152,7 @@ LIB_MOC = \
                SMESHGUI_SewingDlg.h \
                SMESHGUI_MergeNodesDlg.h \
                SMESHGUI_EditMeshDlg.h \
+               SMESHGUI_BuildCompoundDlg.h \
                SMESHGUI_CreatePolyhedralVolumeDlg.h \
                SMESHGUI_Operation.h \
                SMESHGUI_SelectionOp.h \
@@ -157,13 +163,15 @@ LIB_MOC = \
                SMESHGUI_ShapeByMeshDlg.h \
                SMESHGUI_AddQuadraticElementDlg.h \
                SMESHGUI_ConvToQuadDlg.h \
-               SMESHGUI_ConvToQuadOp.h
+               SMESHGUI_ConvToQuadOp.h \
+               SMESHGUI_MakeNodeAtPointDlg.h
 
 
 LIB_CLIENT_IDL = SALOME_Exception.idl \
                 GEOM_Gen.idl \
                 SMESH_Gen.idl \
                 SMESH_Mesh.idl \
+                SMESH_MeshEditor.idl \
                 SMESH_Hypothesis.idl \
                 SMESH_Group.idl \
                 SALOMEDS.idl \
@@ -183,16 +191,16 @@ LIB_SERVER_IDL =
 #BIN = SMESHBin
 
 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 $(BOOST_CPPFLAGS)
+            $(KERNEL_CXXFLAGS)  $(GUI_CXXFLAGS) \
+            $(GEOM_CXXFLAGS) $(BOOST_CPPFLAGS)
 
-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 += -lSMESHObject -lSMESHFiltersSelection -lSMDS -lSMESHControls -lDlgRef \
-       $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome \
+       $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) \
        -lVTKViewer -lSalomeDSClient -lSalomeDS -lSalomeApp -lSalomePrs -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject \
-       -lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer -L${GEOM_ROOT_DIR}/lib/salome -lGEOM -lGEOMClient  \
+       -lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer $(GEOM_LDFLAGS) -lGEOM -lGEOMClient  \
        -lGEOMBase -lGEOMObject -lGEOMFiltersSelection -lSalomeSession
 
 LDFLAGSFORBIN += $(LDFLAGS)