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 V6_main_20120808 08Aug12
[modules/smesh.git]
/
adm_local
/
unix
/
config_files
/
Makefile.am
diff --git
a/adm_local/unix/config_files/Makefile.am
b/adm_local/unix/config_files/Makefile.am
index 3198e9da12ca29f7ad36bad6a91c971f77271d9b..938083baab23366e68418ae6e9a5f71d854fc060 100644
(file)
--- a/
adm_local/unix/config_files/Makefile.am
+++ b/
adm_local/unix/config_files/Makefile.am
@@
-1,23
+1,24
@@
-# Copyright (C) 200
5 OPEN CASCADE, CEA, EDF R&D, LEG
-#
PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+# Copyright (C) 200
7-2012 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
-# License as published by the Free Software Foundation; either
+# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# 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
+#
+# 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.
# 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
+#
+# 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
# 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
-#
+#
+
include $(top_srcdir)/adm_local/unix/make_common_starter.am
include $(top_srcdir)/adm_local/unix/make_common_starter.am
-dist_admlocalm4_DATA = \
- check_SMESH.m4 \
- check_
f77.m4
+dist_admlocalm4_DATA = \
+ check_SMESH.m4
\
+ check_
Platform.m4