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 branch 24/11/2010
[modules/smesh.git]
/
src
/
OBJECT
/
Makefile.am
diff --git
a/src/OBJECT/Makefile.am
b/src/OBJECT/Makefile.am
index 7a6a7b70fa5f8d03a27518902ba3d2590f61f566..219350562eb68a338e600df0604beb9d7c1eeb91 100644
(file)
--- a/
src/OBJECT/Makefile.am
+++ b/
src/OBJECT/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 OBJECT : interactive object for SMESH visualization
# File : Makefile.in
# Modified by : Alexander BORODIN (OCN) - autotools usage
# SMESH OBJECT : interactive object for SMESH visualization
# File : Makefile.in
# Modified by : Alexander BORODIN (OCN) - autotools usage
@@
-36,8
+34,9
@@
salomeinclude_HEADERS = \
SMESH_DeviceActor.h \
SMESH_PreviewActorsCollection.h \
SMESH_ExtractGeometry.h \
SMESH_DeviceActor.h \
SMESH_PreviewActorsCollection.h \
SMESH_ExtractGeometry.h \
- SMESH_ActorUtils.h \
- SMESH_FaceOrientationFilter.h
+ SMESH_FaceOrientationFilter.h \
+ SMESH_ScalarBarActor.h
+
# Libraries targets
# Libraries targets
@@
-49,7
+48,8
@@
dist_libSMESHObject_la_SOURCES = \
SMESH_PreviewActorsCollection.cxx \
SMESH_ExtractGeometry.cxx \
SMESH_ActorUtils.cxx \
SMESH_PreviewActorsCollection.cxx \
SMESH_ExtractGeometry.cxx \
SMESH_ActorUtils.cxx \
- SMESH_FaceOrientationFilter.cxx
+ SMESH_FaceOrientationFilter.cxx \
+ SMESH_ScalarBarActor.cxx
libSMESHObject_la_CPPFLAGS = \
$(QT_INCLUDES) \
libSMESHObject_la_CPPFLAGS = \
$(QT_INCLUDES) \