X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriverMED%2FMakefile.am;h=2e858e471e3ad16ff08d8d6d3970970071053537;hp=6e2b6956d819557696985d692cdf2c9210c008d9;hb=7aebb99e42c6b0c3c056a5eecb0f29033db2231a;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813

diff --git a/src/DriverMED/Makefile.am b/src/DriverMED/Makefile.am
index 6e2b6956d..2e858e471 100644
--- a/src/DriverMED/Makefile.am
+++ b/src/DriverMED/Makefile.am
@@ -1,53 +1,40 @@
-#  SMESH DriverMED : driver to read and write 'med' files
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU Lesser General Public 
-#  License as published by the Free Software Foundation; either 
-#  version 2.1 of the License. 
-# 
-#  This library is distributed in the hope that it will be useful, 
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#  Lesser General Public License for more details. 
-# 
-#  You should have received a copy of the GNU Lesser General Public 
-#  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.com
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
+# You should have received a copy of the GNU Lesser General Public
+# 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.com
+
+#  SMESH DriverMED : driver to read and write 'med' files
 #  File   : Makefile.in
 #  Author : Marc Tajchman (CEA)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : SMESH
-#  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
 salomeinclude_HEADERS = \
-	DriverMED_R_SMDS_Mesh.h \
 	DriverMED_R_SMESHDS_Mesh.h \
-	DriverMED_R_SMESHDS_Document.h \
-	DriverMED_W_SMDS_Mesh.h \
 	DriverMED_W_SMESHDS_Mesh.h \
-	DriverMED_W_SMESHDS_Document.h \
 	DriverMED_Family.h \
 	SMESH_DriverMED.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libMeshDriverMED.la
 dist_libMeshDriverMED_la_SOURCES = \
-	DriverMED_R_SMDS_Mesh.cxx \
 	DriverMED_R_SMESHDS_Mesh.cxx \
-	DriverMED_R_SMESHDS_Document.cxx \
-	DriverMED_W_SMDS_Mesh.cxx \
-	DriverMED_W_SMESHDS_Document.cxx \
 	DriverMED_W_SMESHDS_Mesh.cxx \
 	DriverMED_Family.cxx
 
@@ -64,16 +51,18 @@ libMeshDriverMED_la_CPPFLAGS = \
 	@HDF5_INCLUDES@ \
 	$(KERNEL_CXXFLAGS) \
 	$(CAS_CPPFLAGS) \
+        $(VTK_INCLUDES) \
 	$(BOOST_CPPFLAGS) \
 	-I$(srcdir)/../Driver \
 	-I$(srcdir)/../SMDS \
-	-I$(srcdir)/../SMESHDS \
-	-I$(top_builddir)/salome_adm/unix
+	-I$(srcdir)/../SMESHUtils \
+	-I$(srcdir)/../SMESHDS
 
 libMeshDriverMED_la_LDFLAGS  = \
+	$(BOOST_LIBS) \
 	../Driver/libMeshDriver.la \
-	$(MED_LDFLAGS) -lMEDWrapper
-
+	$(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2
+	$(BOOST_LIB_SYSTEM) 
 
 MED_Test_CPPFLAGS = \
 	$(libMeshDriverMED_la_CPPFLAGS)
@@ -83,6 +72,7 @@ MED_Test_LDADD = \
 	../Driver/libMeshDriver.la \
 	../SMDS/libSMDS.la \
 	../SMESHDS/libSMESHDS.la \
+	${BOOST_LIB_SYSTEM} \
 	$(KERNEL_LDFLAGS) \
 	-lOpUtil \
 	-lSALOMELocalTrace \
@@ -90,7 +80,5 @@ MED_Test_LDADD = \
 	$(MED_LDFLAGS) \
 	-lMEDWrapper \
 	-lMEDWrapperBase \
-	-lMEDWrapper_V2_1 \
-	-lmed_V2_1 \
 	-lMEDWrapper_V2_2
-
+	$(BOOST_LIB_SYSTEM)