Merge from V6_main_20120808 08Aug12

[modules/geom.git] / src / GEOM_SWIG_WITHIHM / Makefile.am

diff --git a/src/GEOM_SWIG_WITHIHM/Makefile.am b/src/GEOM_SWIG_WITHIHM/Makefile.am
index 1fcd94b42bba03501c7c9acdd0b14e11538518b9..e468bfb0d3a5f4bfccb6db16ed9a93737aef4270 100644 (file)
--- a/src/GEOM_SWIG_WITHIHM/Makefile.am
+++ b/src/GEOM_SWIG_WITHIHM/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
 #
+
 #  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
 #  File   : Makefile.in
 #  Author : Nicolas REJNERI, Paul RASCLE
@@ -55,12 +53,14 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../GEOMGUI
 SWIG_SOURCES  = libGEOM_Swig.i
 
-libGEOM_Swig.py: swig_wrap.cpp
+salomepython_PYTHON = libGEOM_Swig.py
+salomepyexec_LTLIBRARIES = _libGEOM_Swig.la
 
-# Libraries targets
-lib_LTLIBRARIES                 = _libGEOM_Swig.la
+libGEOM_Swig.py: swig_wrap.cpp
+BUILT_SOURCES = swig_wrap.cpp
 _libGEOM_Swig_la_SOURCES        = $(SWIG_SOURCES)
-nodist__libGEOM_Swig_la_SOURCES = swig_wrap.cpp
+nodist__libGEOM_Swig_la_SOURCES = $(BUILT_SOURCES)
+
 salomeinclude_HEADERS           = $(SWIG_SOURCES)
 
 _libGEOM_Swig_la_CPPFLAGS =            \
@@ -74,8 +74,7 @@ _libGEOM_Swig_la_CPPFLAGS =           \
        $(CORBA_CXXFLAGS)               \
        $(CORBA_INCLUDES)               \
        -I$(srcdir)/../GEOMGUI          \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 _libGEOM_Swig_la_LDFLAGS = -module
 _libGEOM_Swig_la_LIBADD  =             \
@@ -87,14 +86,3 @@ swig_wrap.cpp : $(SWIG_SOURCES)
 
 CLEANFILES = swig_wrap.cpp libGEOM_Swig.py
 
-#
-# ===============================================================
-# Files to be installed
-# ===============================================================
-#
-
-# Scripts to be installed (distributed)
-dist_salomescript_DATA =
-
-# Scripts to be installed (non-distributed)
-nodist_salomescript_DATA = libGEOM_Swig.py