X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FMakefile.am;h=83c8ceda18181329e6ac37e99cd7fd0888383a24;hb=faf45035fc7589def5fefb624752f48c989d3a6b;hp=1030ffd65e2a2e103d727fe473613cbccecd6ba0;hpb=9357f5c87098aff2b95b754d69f66c76d2df9c24;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am
index 1030ffd65..83c8ceda1 100644
--- a/src/SMESHGUI/Makefile.am
+++ b/src/SMESHGUI/Makefile.am
@@ -1,20 +1,20 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
 # SMESH SMESHGUI : GUI for SMESH component
@@ -47,12 +47,10 @@ salomeinclude_HEADERS = \
 	SMESHGUI_GroupDlg.h \
 	SMESHGUI_RemoveNodesDlg.h \
 	SMESHGUI_RemoveElementsDlg.h \
-	SMESHGUI_MeshInfosDlg.h \
-	SMESHGUI_StandardMeshInfosDlg.h \
-	SMESHGUI_WhatIsDlg.h \
+	SMESHGUI_MeshInfo.h \
+	SMESHGUI_Measurements.h \
 	SMESHGUI_Preferences_ColorDlg.h \
 	SMESHGUI_Preferences_ScalarBarDlg.h \
-	SMESHGUI_MoveNodesDlg.h \
 	SMESHGUI_AddMeshElementDlg.h \
 	SMESHGUI_XmlHandler.h \
 	SMESHGUI_Filter.h \
@@ -72,7 +70,8 @@ salomeinclude_HEADERS = \
 	SMESHGUI_ScaleDlg.h \
 	SMESHGUI_SymmetryDlg.h \
 	SMESHGUI_SewingDlg.h \
-	SMESHGUI_EditMeshDlg.h \
+	SMESHGUI_DuplicateNodesDlg.h \
+	SMESHGUI_MergeDlg.h \
 	SMESHGUI_MeshUtils.h \
 	SMESHGUI_CreatePolyhedralVolumeDlg.h \
 	SMESHGUI_Operation.h \
@@ -95,6 +94,8 @@ salomeinclude_HEADERS = \
 	SMESHGUI_MeshOrderDlg.h \
 	SMESHGUI_MeshOrderOp.h \
 	SMESHGUI_FileValidator.h \
+	SMESHGUI_CopyMeshDlg.h \
+	SMESHGUI_PreviewDlg.h \
 	SMESH_SMESHGUI.hxx
 
 # Libraries targets
@@ -111,12 +112,10 @@ dist_libSMESH_la_SOURCES = \
 	SMESHGUI_GroupDlg.cxx \
 	SMESHGUI_RemoveNodesDlg.cxx \
 	SMESHGUI_RemoveElementsDlg.cxx \
-	SMESHGUI_MeshInfosDlg.cxx \
-	SMESHGUI_StandardMeshInfosDlg.cxx \
-	SMESHGUI_WhatIsDlg.cxx \
+	SMESHGUI_MeshInfo.cxx \
+	SMESHGUI_Measurements.cxx \
 	SMESHGUI_Preferences_ColorDlg.cxx \
 	SMESHGUI_Preferences_ScalarBarDlg.cxx \
-	SMESHGUI_MoveNodesDlg.cxx \
 	SMESHGUI_AddMeshElementDlg.cxx \
 	SMESHGUI_XmlHandler.cxx \
 	SMESHGUI_Filter.cxx \
@@ -136,7 +135,8 @@ dist_libSMESH_la_SOURCES = \
 	SMESHGUI_ScaleDlg.cxx \
 	SMESHGUI_SymmetryDlg.cxx \
 	SMESHGUI_SewingDlg.cxx \
-	SMESHGUI_EditMeshDlg.cxx \
+	SMESHGUI_DuplicateNodesDlg.cxx \
+	SMESHGUI_MergeDlg.cxx \
 	SMESHGUI_Utils.cxx \
 	SMESHGUI_GEOMGenUtils.cxx \
 	SMESHGUI_MeshUtils.cxx \
@@ -169,7 +169,9 @@ dist_libSMESH_la_SOURCES = \
 	SMESHGUI_FindElemByPointDlg.cxx \
 	SMESHGUI_MeshOrderDlg.cxx \
 	SMESHGUI_MeshOrderOp.cxx \
-	SMESHGUI_FileValidator.cxx
+	SMESHGUI_CopyMeshDlg.cxx \
+	SMESHGUI_FileValidator.cxx \
+	SMESHGUI_PreviewDlg.cxx
 
 MOC_FILES = \
 	SMESHGUI_moc.cxx \
@@ -183,12 +185,10 @@ MOC_FILES = \
 	SMESHGUI_GroupDlg_moc.cxx \
 	SMESHGUI_RemoveNodesDlg_moc.cxx \
 	SMESHGUI_RemoveElementsDlg_moc.cxx \
-	SMESHGUI_MeshInfosDlg_moc.cxx \
-	SMESHGUI_StandardMeshInfosDlg_moc.cxx \
-	SMESHGUI_WhatIsDlg_moc.cxx \
+	SMESHGUI_MeshInfo_moc.cxx \
+	SMESHGUI_Measurements_moc.cxx \
 	SMESHGUI_Preferences_ColorDlg_moc.cxx \
 	SMESHGUI_Preferences_ScalarBarDlg_moc.cxx \
-	SMESHGUI_MoveNodesDlg_moc.cxx \
 	SMESHGUI_AddMeshElementDlg_moc.cxx \
 	SMESHGUI_FilterDlg_moc.cxx \
 	SMESHGUI_FilterLibraryDlg_moc.cxx \
@@ -206,7 +206,8 @@ MOC_FILES = \
 	SMESHGUI_ScaleDlg_moc.cxx \
 	SMESHGUI_SymmetryDlg_moc.cxx \
 	SMESHGUI_SewingDlg_moc.cxx \
-	SMESHGUI_EditMeshDlg_moc.cxx \
+	SMESHGUI_DuplicateNodesDlg_moc.cxx \
+	SMESHGUI_MergeDlg_moc.cxx \
 	SMESHGUI_CreatePolyhedralVolumeDlg_moc.cxx \
 	SMESHGUI_Operation_moc.cxx \
 	SMESHGUI_SelectionOp_moc.cxx \
@@ -227,7 +228,9 @@ MOC_FILES = \
 	SMESHGUI_Make2DFrom3DOp_moc.cxx \
 	SMESHGUI_FindElemByPointDlg_moc.cxx \
 	SMESHGUI_MeshOrderDlg_moc.cxx \
-	SMESHGUI_MeshOrderOp_moc.cxx
+	SMESHGUI_CopyMeshDlg_moc.cxx \
+	SMESHGUI_MeshOrderOp_moc.cxx \
+	SMESHGUI_PreviewDlg_moc.cxx
 
 nodist_libSMESH_la_SOURCES= \
 	$(MOC_FILES)
@@ -241,6 +244,7 @@ libSMESH_la_CPPFLAGS = \
 	$(PYTHON_INCLUDES) \
 	$(KERNEL_CXXFLAGS)  \
 	$(GUI_CXXFLAGS) \
+	$(QWT_INCLUDES) \
 	$(GEOM_CXXFLAGS) \
 	$(MED_CXXFLAGS) \
 	$(BOOST_CPPFLAGS) \
@@ -251,10 +255,12 @@ libSMESH_la_CPPFLAGS = \
 	-I$(srcdir)/../OBJECT \
 	-I$(srcdir)/../SMESHFiltersSelection \
 	-I$(srcdir)/../SMDS \
+	-I$(srcdir)/../SMESHDS \
 	-I$(srcdir)/../SMESH \
 	-I$(srcdir)/../SMESH_I \
 	-I$(srcdir)/../Controls \
 	-I$(srcdir)/../SMESHClient \
+	-I$(top_builddir) \
 	-I$(top_builddir)/idl
 
 libSMESH_la_LDFLAGS  = \
@@ -264,9 +270,11 @@ libSMESH_la_LDFLAGS  = \
 	../OBJECT/libSMESHObject.la \
 	$(CAS_LDFLAGS) -lTKV3d \
 	$(GUI_LDFLAGS) -lSalomePrs -lsuit -lSUITApp -lCAM -lstd \
-	$(GEOM_LDFLAGS) -lGEOMBase -lGEOMFiltersSelection -lGEOMObject
+	$(GEOM_LDFLAGS) -lGEOMBase -lGEOMFiltersSelection -lGEOMObject \
+	$(PYTHON_LIBS)
 
 # resources files
 nodist_salomeres_DATA= \
 	SMESH_images.qm \
-	SMESH_msg_en.qm
+	SMESH_msg_en.qm \
+	SMESH_msg_fr.qm