Merge from V6_main 11/02/2013

[tools/medcoupling.git] / src / MEDCoupling / Makefile.am

diff --git a/src/MEDCoupling/Makefile.am b/src/MEDCoupling/Makefile.am
index f293a7ca08100152b411c1a11236679c91814093..4202fab88a46cc37624c1c76d7ed3afef9aba5f7 100644 (file)
--- a/src/MEDCoupling/Makefile.am
+++ b/src/MEDCoupling/Makefile.am
@@ -16,11 +16,10 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+# Author : Anthony Geay (CEA/DEN)
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += CMakeLists.txt
-
 if CPPUNIT_IS_OK
   SUBDIRS = . Test
 endif
@@ -40,7 +39,7 @@ MEDCouplingUMeshDesc.hxx MEDCouplingNatureOfField.hxx MEDCouplingFieldTemplate.h
 MEDCouplingNormalizedCartesianMesh.hxx MEDCouplingNormalizedCartesianMesh.txx                     \
 MEDCouplingRemapper.hxx MEDCouplingExtrudedMesh.hxx MEDCouplingGaussLocalization.hxx              \
 MEDCouplingAutoRefCountObjectPtr.hxx MEDCouplingMultiFields.hxx MEDCouplingDefinitionTime.hxx     \
-MEDCouplingFieldOverTime.hxx
+MEDCouplingFieldOverTime.hxx MEDCouplingCurveLinearMesh.hxx MEDCouplingStructuredMesh.hxx
 
 # Libraries targets
 
@@ -52,12 +51,13 @@ dist_libmedcoupling_la_SOURCES = \
        MEDCouplingPointSet.cxx MEDCouplingUMeshDesc.cxx  MEDCouplingFieldTemplate.cxx      \
        MEDCouplingExtrudedMesh.cxx MEDCouplingMesh.cxx MEDCouplingGaussLocalization.cxx    \
        MEDCouplingNatureOfField.cxx MEDCouplingMultiFields.cxx                             \
-       MEDCouplingDefinitionTime.cxx MEDCouplingFieldOverTime.cxx
+       MEDCouplingDefinitionTime.cxx MEDCouplingFieldOverTime.cxx                          \
+       MEDCouplingCurveLinearMesh.cxx MEDCouplingStructuredMesh.cxx
 
 libmedcoupling_la_LDFLAGS= 
 
 libmedcoupling_la_CPPFLAGS=  @CXXTMPDPTHFLAGS@ \
-       -I$(srcdir) -I$(srcdir)/../INTERP_KERNEL/Bases \
+       -I$(top_builddir) -I$(srcdir) -I$(srcdir)/../INTERP_KERNEL/Bases \
        -I$(srcdir)/../INTERP_KERNEL -I$(srcdir)/../INTERP_KERNEL/Geometric2D \
        -I$(srcdir)/../INTERP_KERNEL/ExprEval -I$(srcdir)/../INTERP_KERNEL/GaussPoints