Join modifications from branch OCC_development_for_3_2_0a2

[modules/visu.git] / src / VISUGUI / Makefile.in

diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in
index 3744c066a2df406882073e64f1dc4fe452e25e0f..3ecc0aef65201f428a40e867c74aaa07426c1e91 100644 (file)
--- a/src/VISUGUI/Makefile.in
+++ b/src/VISUGUI/Makefile.in
@@ -35,69 +35,101 @@ VPATH=.:@srcdir@
 
 # header files 
 EXPORT_HEADERS= \
-                VisuGUI_NonIsometricDlg.h
+               VisuGUI_Tools.h
 
 # .po files to transform in .qm
 PO_FILES = \
-          VISU_msg_en.po VISU_icons.po
+          VISU_msg_en.po VISU_images.po
 
 # Libraries targets
-LIB = libVISUGUI.la
+LIB = libVISU.la
+#LIB_SRC =     VisuGUI_SweepPrefDlg.cxx
+#LIB_MOC =     VisuGUI_SweepPrefDlg.h
+
 LIB_SRC =      VisuGUI.cxx \
+               VisuGUI_Factory.cxx \
+               VisuGUI_Module.cxx \
                VisuGUI_Selection.cxx \
-               VisuGUI_MagnitudeDlg.cxx \
-               VisuGUI_IsoSurfacesDlg.cxx \
+               VisuGUI_Tools.cxx \
+               VisuGUI_ViewTools.cxx \
+               VisuGUI_PopupTools.cxx \
+               VisuGUI_NameDlg.cxx \
+               VisuGUI_FileDlg.cxx \
                VisuGUI_CursorDlg.cxx \
-               VisuGUI_VectorsDlg.cxx \
-               VisuGUI_CutPlanesDlg.cxx \
+               VisuGUI_TimeAnimation.cxx \
+               VisuGUI_EditContainerDlg.cxx \
+               VisuGUI_ClippingDlg.cxx \
+               VisuGUI_DialogRunner.cxx \
+               VisuGUI_OffsetDlg.cxx \
+               VisuGUI_Plot3DDlg.cxx \
                VisuGUI_ScalarBarDlg.cxx \
-               VisuGUI_SweepPrefDlg.cxx \
-               VisuGUI_NonIsometricDlg.cxx \
-                VisuGUI_StreamLinesDlg.cxx \
-                VisuGUI_TimeAnimation.cxx \
+               VisuGUI_GaussPointsDlg.cxx \
+               VisuGUI_DeformedShapeDlg.cxx \
+               VisuGUI_IsoSurfacesDlg.cxx \
                VisuGUI_CutLinesDlg.cxx \
-               VisuGUI_FileDlg.cxx \
-               VisuGUI_EditContainerDlg.cxx
+               VisuGUI_CutPlanesDlg.cxx \
+               VisuGUI_StreamLinesDlg.cxx \
+               VisuGUI_VectorsDlg.cxx \
+               VisuGUI_Displayer.cxx \
+               VisuGUI_ScalarMapOnDeformedShapeDlg.cxx \
+               VisuGUI_SetupPlot2dDlg.cxx \
+               VisuGUI_BuildProgressDlg.cxx \
+               VisuGUI_TransparencyDlg.cxx \
+               VisuGUI_Timer.cxx
 
-LIB_MOC = \
-               VisuGUI.h \
-               VisuGUI_MagnitudeDlg.h \
-               VisuGUI_IsoSurfacesDlg.h \
+LIB_MOC =      VisuGUI.h \
+               VisuGUI_Module.h \
+               VisuGUI_Selection.h \
+               VisuGUI_NameDlg.h \
+               VisuGUI_FileDlg.h \
                VisuGUI_CursorDlg.h \
-               VisuGUI_VectorsDlg.h \
-               VisuGUI_CutPlanesDlg.h \
+               VisuGUI_TimeAnimation.h \
+               VisuGUI_EditContainerDlg.h \
+               VisuGUI_ClippingDlg.h \
+               VisuGUI_DialogRunner.h \
+               VisuGUI_OffsetDlg.h \
+               VisuGUI_Plot3DDlg.h \
                VisuGUI_ScalarBarDlg.h \
-               VisuGUI_SweepPrefDlg.h \
-               VisuGUI_NonIsometricDlg.h \
-                VisuGUI_StreamLinesDlg.h \
-                VisuGUI_TimeAnimation.h \
+               VisuGUI_GaussPointsDlg.h \
+               VisuGUI_DeformedShapeDlg.h \
+               VisuGUI_IsoSurfacesDlg.h \
                VisuGUI_CutLinesDlg.h \
-               VisuGUI_FileDlg.h \
-               VisuGUI_EditContainerDlg.h \
-               VisuGUI_Selection.h
+               VisuGUI_CutPlanesDlg.h \
+               VisuGUI_StreamLinesDlg.h \
+               VisuGUI_VectorsDlg.h \
+               VisuGUI_ScalarMapOnDeformedShapeDlg.h \
+               VisuGUI_SetupPlot2dDlg.h \
+               VisuGUI_BuildProgressDlg.h \
+               VisuGUI_TransparencyDlg.h
 
 LIB_CLIENT_IDL = SALOME_Exception.idl \
                 VISU_Gen.idl \
                 MED_Gen.idl \
                 MED.idl \
                 SALOMEDS.idl \
+                SALOME_GenericObj.idl \
                 SALOME_ModuleCatalog.idl \
                 SALOME_Component.idl \
                  SALOMEDS_Attributes.idl \
+                SALOME_Comm.idl
 
 LIB_SERVER_IDL = 
 
 # additionnal information to compil and link file
 
 CPPFLAGS +=  -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) \
-       $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \
+       -I${KERNEL_ROOT_DIR}/include/salome \
+       -I${MED_ROOT_DIR}/include/salome \
+       $(BOOST_CPPFLAGS)
 CXXFLAGS +=  -ftemplate-depth-32 $(OCC_CXXFLAGS) \
-       -I${KERNEL_ROOT_DIR}/include/salome
+       -I${KERNEL_ROOT_DIR}/include/salome \
+       -I${GUI_ROOT_DIR}/include/salome
 
-LDFLAGS += $(MED2_LIBS) $(HDF5_LIBS) $(VTK_LIBS) $(QWT_LIBS) -lSalomeGUI -lSalomeNS \
-       -lVisuObject -lVISUEngine -lmed -lVTKViewer -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS += $(QWT_LIBS) -lSalomeNS \
+       -lSVTK -lVVTK -lSPlot2d -lVisuObject -lVISUEngineImpl -lVISUGUITOOLS \
+       -L${KERNEL_ROOT_DIR}/lib/salome \
+       -L${GUI_ROOT_DIR}/lib/salome
 
 
 @CONCLUDE@
-