Fix of compilation problems on some platforms

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

diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in
index e3a137822c7aa98b84a03602244a901fa61fc257..a4b466aa59536ffb3a5132eee031618b802af026 100644 (file)
--- a/src/SMESHGUI/Makefile.in
+++ b/src/SMESHGUI/Makefile.in
@@ -43,23 +43,23 @@ EXPORT_HEADERS= SMESHGUI_Swig.hxx \
                SMESHGUI_HypothesesUtils.h \
                SMESHGUI_SpinBox.h \
                SMESHGUI_aParameter.h \
-               SMESHGUI_aParameterDlg.h
+               SMESHGUI_aParameterDlg.h \
+               SMESHGUI_Selection.h \
+               SMESHGUI_FunctionPreview.h
 
 # .po files to transform in .qm
 PO_FILES = \
-          SMESH_icons.po \
+          SMESH_images.po \
           SMESH_msg_en.po
 
 # Libraries targets
-LIB = libSMESHGUI.la
+LIB = libSMESH.la
 LIB_SRC =      SMESHGUI.cxx \
                SMESHGUI_PatternWidget.cxx \
                SMESHGUI_CreatePatternDlg.cxx \
                SMESHGUI_MeshPatternDlg.cxx \
                SMESHGUI_SpinBox.cxx \
                SMESHGUI_NodesDlg.cxx \
-               SMESHGUI_InitMeshDlg.cxx \
-               SMESHGUI_AddSubMeshDlg.cxx \
                SMESHGUI_TransparencyDlg.cxx \
                SMESHGUI_ClippingDlg.cxx \
                SMESHGUI_GroupDlg.cxx \
@@ -88,14 +88,15 @@ LIB_SRC =   SMESHGUI.cxx \
                SMESHGUI_SmoothingDlg.cxx \
                SMESHGUI_RenumberingDlg.cxx \
                SMESHGUI_ExtrusionDlg.cxx \
+               SMESHGUI_ExtrusionAlongPathDlg.cxx \
                SMESHGUI_RevolutionDlg.cxx \
                SMESHGUI_RotationDlg.cxx \
                SMESHGUI_TranslationDlg.cxx \
                SMESHGUI_SymmetryDlg.cxx \
                SMESHGUI_SewingDlg.cxx \
                SMESHGUI_MergeNodesDlg.cxx \
+               SMESHGUI_EditMeshDlg.cxx \
                SMESHGUI_Utils.cxx \
-               SMESHGUI_SMESHGenUtils.cxx \
                SMESHGUI_GEOMGenUtils.cxx \
                SMESHGUI_MeshUtils.cxx \
                SMESHGUI_GroupUtils.cxx \
@@ -103,7 +104,16 @@ LIB_SRC =  SMESHGUI.cxx \
                SMESHGUI_PatternUtils.cxx \
                SMESHGUI_HypothesesUtils.cxx \
                SMESHGUI_PrecisionDlg.cxx \
-               SMESHGUI_VTKUtils.cxx 
+               SMESHGUI_VTKUtils.cxx \
+               SMESHGUI_Selection.cxx \
+               SMESHGUI_CreatePolyhedralVolumeDlg.cxx \
+               SMESHGUI_Operation.cxx \
+               SMESHGUI_SelectionOp.cxx \
+               SMESHGUI_Dialog.cxx \
+               SMESHGUI_MeshDlg.cxx \
+               SMESHGUI_MeshOp.cxx \
+               SMESHGUI_Displayer.cxx \
+               SMESHGUI_FunctionPreview.cxx
 
 LIB_MOC = \
                SMESHGUI.h \
@@ -112,8 +122,6 @@ LIB_MOC = \
                SMESHGUI_CreatePatternDlg.h \
                SMESHGUI_NodesDlg.h \
                SMESHGUI_SpinBox.h \
-               SMESHGUI_InitMeshDlg.h \
-               SMESHGUI_AddSubMeshDlg.h \
                SMESHGUI_TransparencyDlg.h \
                SMESHGUI_ClippingDlg.h \
                SMESHGUI_GroupDlg.h \
@@ -138,14 +146,25 @@ LIB_MOC = \
                SMESHGUI_SmoothingDlg.h \
                SMESHGUI_RenumberingDlg.h \
                SMESHGUI_ExtrusionDlg.h \
+               SMESHGUI_ExtrusionAlongPathDlg.h \
                SMESHGUI_RevolutionDlg.h \
                SMESHGUI_RotationDlg.h \
                SMESHGUI_TranslationDlg.h \
                SMESHGUI_SymmetryDlg.h \
                SMESHGUI_SewingDlg.h \
                SMESHGUI_PrecisionDlg.h \
-               SMESHGUI_MergeNodesDlg.h
-    
+               SMESHGUI_MergeNodesDlg.h \
+               SMESHGUI_aParameter.h \
+               SMESHGUI_EditMeshDlg.h \
+               SMESHGUI_CreatePolyhedralVolumeDlg.h \
+               SMESHGUI_Operation.h \
+               SMESHGUI_SelectionOp.h \
+               SMESHGUI_Dialog.h \
+               SMESHGUI_MeshDlg.h \
+               SMESHGUI_MeshOp.h \
+               SMESHGUI_FunctionPreview.h
+
+
 LIB_CLIENT_IDL = SALOME_Exception.idl \
                 GEOM_Gen.idl \
                 SMESH_Gen.idl \
@@ -169,13 +188,18 @@ LIB_SERVER_IDL =
 #BIN = SMESHBin
 
 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \
-            $(MED2_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome \
-            $(BOOST_CPPFLAGS)
+            -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
+            -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) $(QWT_INCLUDES)
 
-CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
+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 -L${KERNEL_ROOT_DIR}/lib/salome -lVTKViewer -lSalomeGUI -lSalomePrs -lSalomeNS -lqsplitterP -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject -lEvent -lSALOMELocalTrace -lSalomeVTKFilter -lOCCViewer -L${GEOM_ROOT_DIR}/lib/salome -lGEOMGUI -lGEOMClient -lGEOMFiltersSelection -lGEOMBase -lGEOMObject
+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 \
+       -lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer -L${GEOM_ROOT_DIR}/lib/salome -lGEOM -lGEOMClient  \
+       -lGEOMBase -lGEOMObject -lGEOMFiltersSelection $(QWT_LIBS)
 
 LDFLAGSFORBIN += $(LDFLAGS)