Join modifications from branch OCC_debug_for_3_2_0b1

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

diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in
index a4b466aa59536ffb3a5132eee031618b802af026..f600730c8b9b797b462416b9069c7a7e8ac91ca9 100644 (file)
--- a/src/SMESHGUI/Makefile.in
+++ b/src/SMESHGUI/Makefile.in
@@ -42,10 +42,7 @@ EXPORT_HEADERS= SMESHGUI_Swig.hxx \
                SMESHGUI_Hypotheses.h \
                SMESHGUI_HypothesesUtils.h \
                SMESHGUI_SpinBox.h \
-               SMESHGUI_aParameter.h \
-               SMESHGUI_aParameterDlg.h \
-               SMESHGUI_Selection.h \
-               SMESHGUI_FunctionPreview.h
+               SMESHGUI_Selection.h 
 
 # .po files to transform in .qm
 PO_FILES = \
@@ -70,19 +67,15 @@ LIB_SRC =   SMESHGUI.cxx \
                SMESHGUI_Preferences_ColorDlg.cxx \
                SMESHGUI_Preferences_ScalarBarDlg.cxx \
                SMESHGUI_Preferences_SelectionDlg.cxx \
-               SMESHGUI_aParameterDlg.cxx \
                SMESHGUI_Swig.cxx \
                SMESHGUI_MoveNodesDlg.cxx \
                SMESHGUI_AddMeshElementDlg.cxx \
-               SMESHGUI_EditHypothesesDlg.cxx \
-               SMESHGUI_CreateHypothesesDlg.cxx \
                SMESHGUI_XmlHandler.cxx \
                SMESHGUI_Filter.cxx \
                SMESHGUI_FilterDlg.cxx \
                SMESHGUI_FilterLibraryDlg.cxx \
                SMESHGUI_SingleEditDlg.cxx \
                SMESHGUI_MultiEditDlg.cxx \
-               SMESHGUI_aParameter.cxx \
                SMESHGUI_DeleteGroupDlg.cxx \
                SMESHGUI_GroupOpDlg.cxx \
                SMESHGUI_SmoothingDlg.cxx \
@@ -103,7 +96,6 @@ LIB_SRC =    SMESHGUI.cxx \
                SMESHGUI_FilterUtils.cxx \
                SMESHGUI_PatternUtils.cxx \
                SMESHGUI_HypothesesUtils.cxx \
-               SMESHGUI_PrecisionDlg.cxx \
                SMESHGUI_VTKUtils.cxx \
                SMESHGUI_Selection.cxx \
                SMESHGUI_CreatePolyhedralVolumeDlg.cxx \
@@ -113,7 +105,11 @@ LIB_SRC =  SMESHGUI.cxx \
                SMESHGUI_MeshDlg.cxx \
                SMESHGUI_MeshOp.cxx \
                SMESHGUI_Displayer.cxx \
-               SMESHGUI_FunctionPreview.cxx
+               SMESHGUI_Hypotheses.cxx \
+               SMESHGUI_ShapeByMeshDlg.cxx \
+               SMESHGUI_AddQuadraticElementDlg.cxx \
+               SMESHGUI_ConvToQuadDlg.cxx \
+               SMESHGUI_ConvToQuadOp.cxx
 
 LIB_MOC = \
                SMESHGUI.h \
@@ -132,11 +128,8 @@ LIB_MOC = \
                SMESHGUI_Preferences_ColorDlg.h \
                SMESHGUI_Preferences_ScalarBarDlg.h \
                SMESHGUI_Preferences_SelectionDlg.h \
-               SMESHGUI_aParameterDlg.h \
                SMESHGUI_MoveNodesDlg.h \
                SMESHGUI_AddMeshElementDlg.h \
-               SMESHGUI_EditHypothesesDlg.h \
-               SMESHGUI_CreateHypothesesDlg.h \
                SMESHGUI_FilterDlg.h \
                SMESHGUI_FilterLibraryDlg.h \
                SMESHGUI_SingleEditDlg.h \
@@ -152,9 +145,7 @@ LIB_MOC = \
                SMESHGUI_TranslationDlg.h \
                SMESHGUI_SymmetryDlg.h \
                SMESHGUI_SewingDlg.h \
-               SMESHGUI_PrecisionDlg.h \
                SMESHGUI_MergeNodesDlg.h \
-               SMESHGUI_aParameter.h \
                SMESHGUI_EditMeshDlg.h \
                SMESHGUI_CreatePolyhedralVolumeDlg.h \
                SMESHGUI_Operation.h \
@@ -162,7 +153,11 @@ LIB_MOC = \
                SMESHGUI_Dialog.h \
                SMESHGUI_MeshDlg.h \
                SMESHGUI_MeshOp.h \
-               SMESHGUI_FunctionPreview.h
+               SMESHGUI_Hypotheses.h \
+               SMESHGUI_ShapeByMeshDlg.h \
+               SMESHGUI_AddQuadraticElementDlg.h \
+               SMESHGUI_ConvToQuadDlg.h \
+               SMESHGUI_ConvToQuadOp.h
 
 
 LIB_CLIENT_IDL = SALOME_Exception.idl \
@@ -189,17 +184,16 @@ LIB_SERVER_IDL =
 
 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) $(QWT_INCLUDES)
+            -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
 
 CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
             -I${GEOM_ROOT_DIR}/include/salome
 
-
 LDFLAGS += -lSMESHObject -lSMESHFiltersSelection -lSMDS -lSMESHControls -lDlgRef \
        $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome \
-       -lVTKViewer -lSalomeApp -lSalomePrs -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject \
+       -lVTKViewer -lSalomeDSClient -lSalomeDS -lSalomeApp -lSalomePrs -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject \
        -lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer -L${GEOM_ROOT_DIR}/lib/salome -lGEOM -lGEOMClient  \
-       -lGEOMBase -lGEOMObject -lGEOMFiltersSelection $(QWT_LIBS)
+       -lGEOMBase -lGEOMObject -lGEOMFiltersSelection -lSalomeSession
 
 LDFLAGSFORBIN += $(LDFLAGS)