X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FMakefile.in;h=a4b466aa59536ffb3a5132eee031618b802af026;hp=973071422746da9b6b9974cc878bfa1e5df8e2e3;hb=326ed6ac2c5ebb9a16e4b9cc4eeab1b96d784d54;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f

diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in
index 973071422..a4b466aa5 100644
--- a/src/SMESHGUI/Makefile.in
+++ b/src/SMESHGUI/Makefile.in
@@ -43,29 +43,30 @@ 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 \
 		SMESHGUI_RemoveNodesDlg.cxx \
 		SMESHGUI_RemoveElementsDlg.cxx \
 		SMESHGUI_MeshInfosDlg.cxx \
+		SMESHGUI_StandardMeshInfosDlg.cxx \
 		SMESHGUI_Preferences_ColorDlg.cxx \
 		SMESHGUI_Preferences_ScalarBarDlg.cxx \
 		SMESHGUI_Preferences_SelectionDlg.cxx \
@@ -87,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 \
@@ -102,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 \
@@ -111,14 +122,13 @@ 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 \
 		SMESHGUI_RemoveNodesDlg.h \
 		SMESHGUI_RemoveElementsDlg.h \
 		SMESHGUI_MeshInfosDlg.h \
+		SMESHGUI_StandardMeshInfosDlg.h \
 		SMESHGUI_Preferences_ColorDlg.h \
 		SMESHGUI_Preferences_ScalarBarDlg.h \
 		SMESHGUI_Preferences_SelectionDlg.h \
@@ -136,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 \
@@ -167,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)