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

diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in
index eba2c5268..a4b466aa5 100644
--- a/src/SMESHGUI/Makefile.in
+++ b/src/SMESHGUI/Makefile.in
@@ -29,103 +29,178 @@
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
+VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl
 
 
 @COMMENCE@
 
 # header files 
 EXPORT_HEADERS= SMESHGUI_Swig.hxx \
-		SMESHGUI_Swig.i
+		SMESHGUI_Swig.i \
+		SMESHGUI.h \
+		SMESHGUI_Utils.h \
+		SMESHGUI_Hypotheses.h \
+		SMESHGUI_HypothesesUtils.h \
+		SMESHGUI_SpinBox.h \
+		SMESHGUI_aParameter.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_StudyAPI.cxx \
+		SMESHGUI_PatternWidget.cxx \
+		SMESHGUI_CreatePatternDlg.cxx \
+		SMESHGUI_MeshPatternDlg.cxx \
 		SMESHGUI_SpinBox.cxx \
 		SMESHGUI_NodesDlg.cxx \
-		SMESHGUI_AddHypothesisDlg.cxx \
-		SMESHGUI_AddAlgorithmDlg.cxx \
-		SMESHGUI_InitMeshDlg.cxx \
-		SMESHGUI_AddSubMeshDlg.cxx \
-		SMESHGUI_LocalLengthDlg.cxx \
-		SMESHGUI_NbSegmentsDlg.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_MaxElementAreaDlg.cxx \
 		SMESHGUI_Preferences_ScalarBarDlg.cxx \
-		SMESHGUI_EditScalarBarDlg.cxx \
+		SMESHGUI_Preferences_SelectionDlg.cxx \
 		SMESHGUI_aParameterDlg.cxx \
-		SMESHGUI_MaxElementVolumeDlg.cxx \
 		SMESHGUI_Swig.cxx \
-		SMESHGUI_ComputeScalarValue.cxx \
 		SMESHGUI_MoveNodesDlg.cxx \
-		SMESHGUI_OrientationElementsDlg.cxx \
-		SMESHGUI_DiagonalInversionDlg.cxx \
-		SMESHGUI_EdgesConnectivityDlg.cxx \
-		SMESHGUI_AddFaceDlg.cxx \
-		SMESHGUI_AddVolumeDlg.cxx \
-		SMESHGUI_AddEdgeDlg.cxx \
-		SMESHGUI_EditHypothesesDlg.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 \
+		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_GEOMGenUtils.cxx \
+		SMESHGUI_MeshUtils.cxx \
+		SMESHGUI_GroupUtils.cxx \
+		SMESHGUI_FilterUtils.cxx \
+		SMESHGUI_PatternUtils.cxx \
+		SMESHGUI_HypothesesUtils.cxx \
+		SMESHGUI_PrecisionDlg.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 \
+		SMESHGUI_PatternWidget.h \
+		SMESHGUI_MeshPatternDlg.h \
+		SMESHGUI_CreatePatternDlg.h \
 		SMESHGUI_NodesDlg.h \
 		SMESHGUI_SpinBox.h \
-		SMESHGUI_AddHypothesisDlg.h \
-		SMESHGUI_AddAlgorithmDlg.h \
-		SMESHGUI_InitMeshDlg.h \
-		SMESHGUI_AddSubMeshDlg.h \
-		SMESHGUI_LocalLengthDlg.h \
-		SMESHGUI_NbSegmentsDlg.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_MaxElementAreaDlg.h \
 		SMESHGUI_Preferences_ScalarBarDlg.h \
-		SMESHGUI_EditScalarBarDlg.h \
+		SMESHGUI_Preferences_SelectionDlg.h \
 		SMESHGUI_aParameterDlg.h \
-		SMESHGUI_MaxElementVolumeDlg.h \
 		SMESHGUI_MoveNodesDlg.h \
-		SMESHGUI_OrientationElementsDlg.h \
-		SMESHGUI_DiagonalInversionDlg.h \
-		SMESHGUI_EdgesConnectivityDlg.h \
-		SMESHGUI_AddEdgeDlg.h \
-		SMESHGUI_AddVolumeDlg.h \
-		SMESHGUI_AddFaceDlg.h \
-		SMESHGUI_EditHypothesesDlg.h
+		SMESHGUI_AddMeshElementDlg.h \
+		SMESHGUI_EditHypothesesDlg.h \
+		SMESHGUI_CreateHypothesesDlg.h \
+		SMESHGUI_FilterDlg.h \
+		SMESHGUI_FilterLibraryDlg.h \
+		SMESHGUI_SingleEditDlg.h \
+		SMESHGUI_MultiEditDlg.h \
+		SMESHGUI_DeleteGroupDlg.h \
+		SMESHGUI_GroupOpDlg.h \
+		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_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 \
-		 GEOM_Shape.idl \
 		 SMESH_Gen.idl \
 		 SMESH_Mesh.idl \
 		 SMESH_Hypothesis.idl \
-		 SMESH_BasicHypothesis.idl \
+		 SMESH_Group.idl \
 		 SALOMEDS.idl \
 		 SALOMEDS_Attributes.idl \
 		 SALOME_ModuleCatalog.idl \
 		 SALOME_Component.idl \
-		 MED.idl
+		 MED.idl \
+		 SMESH_Filter.idl \
+		 SMESH_Pattern.idl \
+		 SALOME_GenericObj.idl \
+		 SALOME_Comm.idl
 
 LIB_SERVER_IDL = 
 
 # additionnal information to compil and link file
 
-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
-CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
-#$(OCC_CXXFLAGS)
+#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) $(QWT_INCLUDES)
+
+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 \
+	-lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer -L${GEOM_ROOT_DIR}/lib/salome -lGEOM -lGEOMClient  \
+	-lGEOMBase -lGEOMObject -lGEOMFiltersSelection $(QWT_LIBS)
 
-LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lSMESHObject -lSMDS -lSMESHDS -lSMESHFiltersSelection -lGEOMClient -lMeshDriverDAT -lMeshDriverMED -lMeshDriverUNV $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome
+LDFLAGSFORBIN += $(LDFLAGS)
 
 @CONCLUDE@