Join modifications from branch BR_3_1_0deb

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

diff --git a/src/StdMeshersGUI/Makefile.in b/src/StdMeshersGUI/Makefile.in
index 86eb49764867317fad1c31d590913e45f45739bd..def734a2cbde74368aefe00b8461c70db7d9eaeb 100644 (file)
--- a/src/StdMeshersGUI/Makefile.in
+++ b/src/StdMeshersGUI/Makefile.in
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Julia DOROVSKIKH
 #  Module : SMESH
-#  $Header$
 
 top_srcdir=@top_srcdir@
 top_builddir=../..
@@ -35,42 +34,52 @@ VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/sal
 
 # .po files to transform in .qm
  PO_FILES = \
-       StdMeshers_icons.po \
+       StdMeshers_images.po \
        StdMeshers_msg_en.po
 
 # Libraries targets
 LIB = libStdMeshersGUI.la
 LIB_SRC = \
        StdMeshersGUI.cxx \
-       StdMeshersGUI_CreateHypothesisDlg.cxx \
-       StdMeshersGUI_CreateStdHypothesisDlg.cxx \
-       StdMeshersGUI_Parameters.cxx
+       StdMeshersGUI_StdHypothesisCreator.cxx \
+       StdMeshersGUI_DistrPreview.cxx \
+       StdMeshersGUI_DistrTable.cxx \
+       StdMeshersGUI_NbSegmentsCreator.cxx
 
 LIB_MOC = \
-       StdMeshersGUI_CreateHypothesisDlg.h \
-       StdMeshersGUI_CreateStdHypothesisDlg.h 
+       StdMeshersGUI_StdHypothesisCreator.h \
+       StdMeshersGUI_DistrPreview.h \
+       StdMeshersGUI_DistrTable.h \
+       StdMeshersGUI_NbSegmentsCreator.h
 
-EXPORT_HEADERS = StdMeshersGUI_CreateHypothesisDlg.h
+EXPORT_HEADERS =
 
 LIB_CLIENT_IDL = \
        SALOME_Exception.idl \
        SMESH_Hypothesis.idl \
-       SMESH_BasicHypothesis.idl
+       SMESH_BasicHypothesis.idl \
+       SMESH_Mesh.idl
 
 ## pb in dependencies search
 LIB_CLIENT_IDL += \
-       SALOME_GenericObj.idl
+       SALOMEDS.idl \
+       SALOME_GenericObj.idl \
+       SALOME_ContainerManager.idl \
+       SALOME_Component.idl \
+       GEOM_Gen.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 \
-            $(BOOST_CPPFLAGS)
-CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
-#$(OCC_CXXFLAGS)
+            -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome \
+            $(BOOST_CPPFLAGS) $(QWT_INCLUDES)
 
-LDFLAGS += -lSMESHGUI -lVTKViewer -lSalomeGUI -lSMESHObject -lSMESHFiltersSelection $(OCC_KERNEL_LIBS) -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome
+CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
+
+LDFLAGS += -lSMESH -lVTKViewer -lSalomeApp -lSMESHObject -lSMESHFiltersSelection $(OCC_KERNEL_LIBS) \
+         -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome \
+         $(QWT_LIBS)
 
 @CONCLUDE@