X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FMakefile.am;h=34086239638b14b88b119909d8fd278037704bf6;hb=373c03904b8e3fc5490ff4e17716f0cdcb39c03c;hp=040c9849f6490f4c534f84a4884f61e858e2575b;hpb=418c46e9629912d2663714e7bd740000628a0c32;p=modules%2Fsmesh.git diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am index 040c9849f..340862396 100644 --- a/src/SMESH/Makefile.am +++ b/src/SMESH/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,7 @@ # Author : Paul RASCLE, EDF # Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files @@ -34,10 +34,6 @@ salomeinclude_HEADERS = \ SMESH_Hypothesis.hxx \ SMESH_HypoFilter.hxx \ SMESH_Algo.hxx \ - SMESH_0D_Algo.hxx \ - SMESH_1D_Algo.hxx \ - SMESH_2D_Algo.hxx \ - SMESH_3D_Algo.hxx \ SMESH_Group.hxx \ SMESH_MeshEditor.hxx \ SMESH_Pattern.hxx \ @@ -56,10 +52,6 @@ dist_libSMESHimpl_la_SOURCES = \ SMESH_subMesh.cxx \ SMESH_Hypothesis.cxx \ SMESH_Algo.cxx \ - SMESH_0D_Algo.cxx \ - SMESH_1D_Algo.cxx \ - SMESH_2D_Algo.cxx \ - SMESH_3D_Algo.cxx \ SMESH_Group.cxx \ SMESH_MeshEditor.cxx \ SMESH_Pattern.cxx \ @@ -83,10 +75,15 @@ libSMESHimpl_la_CPPFLAGS = \ -I$(srcdir)/../DriverUNV \ -I$(srcdir)/../DriverSTL \ -I$(srcdir)/../DriverCGNS \ + -I$(srcdir)/../DriverGMF \ -I$(srcdir)/../SMDS \ -I$(srcdir)/../SMESHDS \ -I$(srcdir)/../SMESHUtils +if WITH_CGNS + DriverCGNS_LIB = ../DriverCGNS/libMeshDriverCGNS.la +endif + libSMESHimpl_la_LDFLAGS = \ ../SMESHDS/libSMESHDS.la \ ../Controls/libSMESHControls.la \ @@ -94,7 +91,10 @@ libSMESHimpl_la_LDFLAGS = \ ../DriverSTL/libMeshDriverSTL.la \ ../DriverMED/libMeshDriverMED.la \ ../DriverUNV/libMeshDriverUNV.la \ - ../DriverCGNS/libMeshDriverCGNS.la \ + ../DriverGMF/libMeshDriverGMF.la \ + $(DriverCGNS_LIB) \ ../SMESHUtils/libSMESHUtils.la \ + $(BOOST_LIB_THREAD) \ + $(BOOST_LIB_SYSTEM) \ $(GEOM_LDFLAGS) -lNMTTools \ - $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d + $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF