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
/
OBJECT
/
Makefile.am
diff --git
a/src/OBJECT/Makefile.am
b/src/OBJECT/Makefile.am
index 8ef36754fc6d1723b19109fc10f9037c7d216db5..0e8cdabd9115f3c421ee9537684f974bdfd865e3 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,7
+34,6
@@
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
# Libraries targets
SMESH_FaceOrientationFilter.h
# Libraries targets
@@
-70,13
+67,13
@@
libSMESHObject_la_CPPFLAGS = \
-I$(srcdir)/../DriverMED \
-I$(srcdir)/../SMESH \
-I$(srcdir)/../SMESHClient \
-I$(srcdir)/../DriverMED \
-I$(srcdir)/../SMESH \
-I$(srcdir)/../SMESHClient \
- -I$(top_builddir)/idl \
- -I$(top_builddir)/salome_adm/unix
+ -I$(top_builddir)/idl
libSMESHObject_la_LDFLAGS = \
../SMESHClient/libSMESHClient.la \
../SMDS/libSMDS.la \
../Controls/libSMESHControls.la \
$(GUI_LDFLAGS) -lSalomeApp -lSalomeObject -lSVTK -lVTKViewer -lqtx -lsuit \
libSMESHObject_la_LDFLAGS = \
../SMESHClient/libSMESHClient.la \
../SMDS/libSMDS.la \
../Controls/libSMESHControls.la \
$(GUI_LDFLAGS) -lSalomeApp -lSalomeObject -lSVTK -lVTKViewer -lqtx -lsuit \
+ $(GEOM_LDFLAGS) -lGEOMObject \
$(CAS_KERNEL) \
$(VTK_LIBS) $(QT_MT_LIBS)
$(CAS_KERNEL) \
$(VTK_LIBS) $(QT_MT_LIBS)