X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=idl%2FMakefile.am;h=766ffa0bb6d08ac1fb765cc0b8a12b3933aa4fc7;hp=a1d468cb5e0d95ea24c0c9b72250a3369086edbe;hb=43db13f33a1d75fae36db8f06fa378ed7906a332;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070

diff --git a/idl/Makefile.am b/idl/Makefile.am
index a1d468cb5..766ffa0bb 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,24 +1,22 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  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 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.
 #
-#  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
 #
-#  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
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # This Makefile is responsible of generating the client and server
 # implementation of IDL interfaces for both C++ and python usage.
 # The building process of the C++ files is in charge of each source
@@ -34,7 +32,8 @@ BASEIDL_FILES = \
 	SMESH_Filter.idl \
 	SMESH_Group.idl \
 	SMESH_Pattern.idl \
-	SMESH_MeshEditor.idl
+	SMESH_MeshEditor.idl \
+	SMESH_Measurements.idl
 
 # This variable defines the files to be installed
 dist_salomeidl_DATA = $(BASEIDL_FILES)
@@ -51,13 +50,16 @@ nodist_libSalomeIDLSMESH_la_SOURCES = \
 	SMESH_FilterSK.cc \
 	SMESH_GroupSK.cc \
 	SMESH_PatternSK.cc \
-	SMESH_MeshEditorSK.cc
+	SMESH_MeshEditorSK.cc \
+	SMESH_MeasurementsSK.cc
+
+# to be done at first, to avoid parallel compilation problems
+BUILT_SOURCES = $(nodist_libSalomeIDLSMESH_la_SOURCES)
 
 # header files must be exported: other modules have to use this library
 nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLSMESH_la_CPPFLAGS =			\
-	-I$(top_builddir)/salome_adm/unix	\
 	-I$(top_builddir)/idl			\
 	$(CORBA_CXXFLAGS) $(CORBA_INCLUDES)	\
 	$(KERNEL_CXXFLAGS) $(MED_CXXFLAGS)	\
@@ -85,8 +87,7 @@ IDLCXXFLAGS = \
 	-I$(top_builddir)/idl/salome \
 	-I$(KERNEL_ROOT_DIR)/idl/salome \
 	-I$(MED_ROOT_DIR)/idl/salome \
-	-I$(GEOM_ROOT_DIR)/idl/salome \
-	-I$(top_builddir)/salome_adm/unix
+	-I$(GEOM_ROOT_DIR)/idl/salome
 
 IDLPYFLAGS  = \
 	@IDLPYFLAGS@ \