Merging with WPdev

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

diff --git a/src/StdMeshersGUI/Makefile.in b/src/StdMeshersGUI/Makefile.in
index 9e0d5039821d3607f485304313a71971cf5c70fc..d84f17c24edad6f0c2f55e583ad03ddeed1f2369 100644 (file)
--- a/src/StdMeshersGUI/Makefile.in
+++ b/src/StdMeshersGUI/Makefile.in
@@ -16,14 +16,13 @@
 #  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.org
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
 #  File   : Makefile.in
 #  Author : Julia DOROVSKIKH
 #  Module : SMESH
-#  $Header$
 
 top_srcdir=@top_srcdir@
 top_builddir=../..
@@ -42,38 +41,51 @@ VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/sal
 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 \
+       StdMeshersGUI_ObjectReferenceParamWdg.cxx \
+       StdMeshersGUI_LayerDistributionParamWdg.cxx
 
 LIB_MOC = \
-       StdMeshersGUI_CreateHypothesisDlg.h \
-       StdMeshersGUI_CreateStdHypothesisDlg.h 
+       StdMeshersGUI_StdHypothesisCreator.h \
+       StdMeshersGUI_DistrPreview.h \
+       StdMeshersGUI_DistrTable.h \
+       StdMeshersGUI_NbSegmentsCreator.h \
+       StdMeshersGUI_ObjectReferenceParamWdg.h \
+       StdMeshersGUI_LayerDistributionParamWdg.h
 
-EXPORT_HEADERS = StdMeshersGUI_CreateHypothesisDlg.h \
-                StdMeshersGUI_Parameters.h
+EXPORT_HEADERS = StdMeshersGUI_StdHypothesisCreator.h
 
 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_Comm.idl \
+       SALOMEDS.idl \
        SALOME_GenericObj.idl \
+       SALOME_ContainerManager.idl \
        SALOME_Component.idl \
-       GEOM_Gen.idl
+       GEOM_Gen.idl \
+       MED.idl
 
 LIB_SERVER_IDL = 
 
 # additionnal information to compil and link file
 
 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)
-CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
-#$(OCC_CXXFLAGS)
+            $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS) \
+            $(BOOST_CPPFLAGS) $(QWT_INCLUDES)
 
-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
+CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS)
+
+LDFLAGS += -lSMESH -lVTKViewer -lSalomeApp -lSMESHObject -lSMESHFiltersSelection $(OCC_KERNEL_LIBS) \
+         -lTKBO $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(GUI_LDFLAGS) \
+         $(QWT_LIBS)
 
 @CONCLUDE@