X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FMakefile.in;h=2f38fc04e4792c8aaa0f02e6a3ce5f2043005881;hb=9313a9353cce92fd1c7926b3a2358916822a827e;hp=44991ebdeec9bb8973eff68463628376962e85ba;hpb=5980f7c6cc925471e77507c48b92b84742432348;p=modules%2Fsmesh.git

diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in
index 44991ebde..2f38fc04e 100644
--- a/src/SMESH_I/Makefile.in
+++ b/src/SMESH_I/Makefile.in
@@ -30,59 +30,64 @@
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
+VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:
 
 
 @COMMENCE@
 
+# header files  
+EXPORT_HEADERS= \
+	SMESH_Gen_i.hxx \
+	SMESH_Algo_i.hxx \
+	SMESH_1D_Algo_i.hxx \
+	SMESH_2D_Algo_i.hxx \
+	SMESH_3D_Algo_i.hxx \
+	SMESH_subMesh_i.hxx \
+	SMESH_topo.hxx \
+	SMESH_Mesh_i.hxx \
+	SMESH_Hypothesis_i.hxx
+
 EXPORT_PYSCRIPTS = smeshpy.py SMESH_test.py
 
 # Libraries targets
 
 LIB= libSMESHEngine.la
 
-LIB_SRC = SMESH_Gen_i.cxx SMESH_Mesh_i.cxx SMESH_MEDMesh_i.cxx \
-          SMESH_MEDFamily_i.cxx SMESH_MEDSupport_i.cxx \
-          SMESH_subMesh_i.cxx \
-          SMESH_MeshEditor_i.cxx \
-          SMESH_Hypothesis_i.cxx \
-          SMESH_topo.cxx SMESH_HypothesisFactory_i.cxx \
-          SMESH_Algo_i.cxx \
-          SMESH_1D_Algo_i.cxx \
-          SMESH_2D_Algo_i.cxx \
-          SMESH_3D_Algo_i.cxx \
-          SMESH_NumberOfSegments_i.cxx \
-          SMESH_LocalLength_i.cxx \
-          SMESH_MaxElementArea_i.cxx \
-	  SMESH_LengthFromEdges_i.cxx \
-          SMESH_MaxElementVolume_i.cxx \
-          SMESH_Regular_1D_i.cxx \
-          SMESH_Quadrangle_2D_i.cxx \
-          SMESH_MEFISTO_2D_i.cxx \
-          SMESH_Hexa_3D_i.cxx
+LIB_SRC = \
+	SMESH_Gen_i.cxx \
+	SMESH_Mesh_i.cxx \
+	SMESH_MEDMesh_i.cxx \
+        SMESH_MEDFamily_i.cxx \
+	SMESH_MEDSupport_i.cxx \
+        SMESH_subMesh_i.cxx \
+        SMESH_MeshEditor_i.cxx \
+        SMESH_Hypothesis_i.cxx \
+        SMESH_topo.cxx \
+        SMESH_Algo_i.cxx \
+        SMESH_1D_Algo_i.cxx \
+        SMESH_2D_Algo_i.cxx \
+        SMESH_3D_Algo_i.cxx \
+	SMESH_Filter_i.cxx \
+	SMESH_Group_i.cxx
 
 LIB_SERVER_IDL = SMESH_Gen.idl SMESH_Hypothesis.idl SMESH_Mesh.idl \
                  SALOME_Component.idl SALOME_Exception.idl \
-                 SMESH_BasicHypothesis.idl
+                 SMESH_Filter.idl SMESH_Group.idl
 
-LIB_CLIENT_IDL = SALOMEDS.idl GEOM_Gen.idl GEOM_Shape.idl MED.idl SALOMEDS_Attributes.idl
+LIB_CLIENT_IDL = SALOMEDS.idl GEOM_Gen.idl GEOM_Shape.idl MED.idl SALOMEDS_Attributes.idl SALOME_GenericObj.idl
 
 # Executables targets
 BIN = 
 BIN_SRC = 
 
 # additionnal information to compil and link file
-CPPFLAGS+= $(OCC_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
-CXXFLAGS+= $(OCC_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
+CPPFLAGS+= $(OCC_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
+           -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
+CXXFLAGS+= $(OCC_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
+           -I${GEOM_ROOT_DIR}/include/salome
 
 #IDLCXXFLAGS+= -Wbtp
 
-LDFLAGS+= $(HDF5_LIBS) $(MED2_LIBS) -lSMESHimpl -lSalomeContainer -lSalomeNS -lSalomeDS -lRegistry -lSalomeHDFPersist -lOpUtil -lGEOMClient -lSMESHDS -lSMDS -lMEFISTO2D -lMeshDriverMED -lSalomeLifeCycleCORBA -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome
-
-ifeq (@WITHNETGEN@,yes)
-  LIB_SRC += SMESH_NETGEN_3D_i.cxx
-  LDFLAGS += -lNETGEN
-endif
+LDFLAGS+= $(HDF5_LIBS) $(MED2_LIBS) -lSMESHimpl -lSalomeContainer -lSalomeNS -lSalomeDS -lRegistry -lSalomeHDFPersist -lOpUtil -lGEOMClient -lSMESHDS -lSMDS -lMeshDriverMED -lSalomeLifeCycleCORBA -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj
 
 @CONCLUDE@
-