Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V5_1_main 14/05/2010
[modules/smesh.git]
/
src
/
SMESH_SWIG_WITHIHM
/
Makefile.am
diff --git
a/src/SMESH_SWIG_WITHIHM/Makefile.am
b/src/SMESH_SWIG_WITHIHM/Makefile.am
index e540dd1ab7e959a729f5ac756c01842e5787ec4f..fc6d37ea13970c9d07a20cb82fb3c9adc3f8499c 100644
(file)
--- a/
src/SMESH_SWIG_WITHIHM/Makefile.am
+++ b/
src/SMESH_SWIG_WITHIHM/Makefile.am
@@
-1,7
+1,4
@@
-# Copyright (C) 2007-2008 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
+# Copyright (C) 2007-2010 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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-19,6
+16,7
@@
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+
# SMESH SMESHGUI : GUI for SMESH component
# File : Makefile.am
# Author : Alexander BORODIN, Open CASCADE S.A.S.
# SMESH SMESHGUI : GUI for SMESH component
# File : Makefile.am
# Author : Alexander BORODIN, Open CASCADE S.A.S.
@@
-73,8
+71,7
@@
_libSMESH_Swig_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \
-I$(srcdir) \
-I$(srcdir)/../SMESHGUI \
$(BOOST_CPPFLAGS) \
-I$(srcdir) \
-I$(srcdir)/../SMESHGUI \
- -I$(top_builddir)/idl \
- -I$(top_builddir)/salome_adm/unix
+ -I$(top_builddir)/idl
_libSMESH_Swig_la_LDFLAGS = -module
_libSMESH_Swig_la_LIBADD = ../SMESHGUI/libSMESH.la \
_libSMESH_Swig_la_LDFLAGS = -module
_libSMESH_Swig_la_LIBADD = ../SMESHGUI/libSMESH.la \