Merge from OCC_development_generic_2006

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

diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in
index 2833cf2a375cf90045899cc5262f0b60062a8ac5..55987d6c233c4e76602110c06315d03e4a49a7b2 100644 (file)
--- a/src/SMESHGUI/Makefile.in
+++ b/src/SMESHGUI/Makefile.in
@@ -42,9 +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_Selection.h 
 
 # .po files to transform in .qm
 PO_FILES = \
@@ -59,8 +57,6 @@ LIB_SRC =     SMESHGUI.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 \
@@ -71,7 +67,6 @@ 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 \
@@ -83,7 +78,6 @@ LIB_SRC =     SMESHGUI.cxx \
                SMESHGUI_FilterLibraryDlg.cxx \
                SMESHGUI_SingleEditDlg.cxx \
                SMESHGUI_MultiEditDlg.cxx \
-               SMESHGUI_aParameter.cxx \
                SMESHGUI_DeleteGroupDlg.cxx \
                SMESHGUI_GroupOpDlg.cxx \
                SMESHGUI_SmoothingDlg.cxx \
@@ -96,6 +90,7 @@ LIB_SRC =     SMESHGUI.cxx \
                SMESHGUI_SymmetryDlg.cxx \
                SMESHGUI_SewingDlg.cxx \
                SMESHGUI_MergeNodesDlg.cxx \
+               SMESHGUI_EditMeshDlg.cxx \
                SMESHGUI_Utils.cxx \
                SMESHGUI_GEOMGenUtils.cxx \
                SMESHGUI_MeshUtils.cxx \
@@ -106,7 +101,15 @@ LIB_SRC =  SMESHGUI.cxx \
                SMESHGUI_PrecisionDlg.cxx \
                SMESHGUI_VTKUtils.cxx \
                SMESHGUI_Selection.cxx \
-               SMESHGUI_CreatePolyhedralVolumeDlg.cxx 
+               SMESHGUI_CreatePolyhedralVolumeDlg.cxx \
+               SMESHGUI_Operation.cxx \
+               SMESHGUI_SelectionOp.cxx \
+               SMESHGUI_Dialog.cxx \
+               SMESHGUI_MeshDlg.cxx \
+               SMESHGUI_MeshOp.cxx \
+               SMESHGUI_Displayer.cxx \
+               SMESHGUI_Hypotheses.cxx \
+               SMESHGUI_ShapeByMeshDlg.cxx
 
 LIB_MOC = \
                SMESHGUI.h \
@@ -115,8 +118,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 \
@@ -127,7 +128,6 @@ 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 \
@@ -149,8 +149,17 @@ LIB_MOC = \
                SMESHGUI_SewingDlg.h \
                SMESHGUI_PrecisionDlg.h \
                SMESHGUI_MergeNodesDlg.h \
-               SMESHGUI_CreatePolyhedralVolumeDlg.h
-    
+               SMESHGUI_EditMeshDlg.h \
+               SMESHGUI_CreatePolyhedralVolumeDlg.h \
+               SMESHGUI_Operation.h \
+               SMESHGUI_SelectionOp.h \
+               SMESHGUI_Dialog.h \
+               SMESHGUI_MeshDlg.h \
+               SMESHGUI_MeshOp.h \
+               SMESHGUI_Hypotheses.h \
+               SMESHGUI_ShapeByMeshDlg.h
+
+
 LIB_CLIENT_IDL = SALOME_Exception.idl \
                 GEOM_Gen.idl \
                 SMESH_Gen.idl \
@@ -180,8 +189,11 @@ CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYT
 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 -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
+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
 
 LDFLAGSFORBIN += $(LDFLAGS)