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
Join modifications from branch BR_3_1_0deb
[modules/smesh.git]
/
src
/
StdMeshers
/
Makefile.in
diff --git
a/src/StdMeshers/Makefile.in
b/src/StdMeshers/Makefile.in
index 88661b551a35eeaa5c18d32be92044654b5c0708..592ff2b2b14620ec1ee2ce3755518ca7a51b201a 100644
(file)
--- a/
src/StdMeshers/Makefile.in
+++ b/
src/StdMeshers/Makefile.in
@@
-23,7
+23,6
@@
# File : Makefile.in
# Author : Julia DOROVSKIKH
# Module : SMESH
# File : Makefile.in
# Author : Julia DOROVSKIKH
# Module : SMESH
-# $Header$
top_srcdir=@top_srcdir@
top_builddir=../..
top_srcdir=@top_srcdir@
top_builddir=../..
@@
-48,7
+47,10
@@
EXPORT_HEADERS = \
StdMeshers_Regular_1D.hxx \
StdMeshers_Quadrangle_2D.hxx \
StdMeshers_MEFISTO_2D.hxx \
StdMeshers_Regular_1D.hxx \
StdMeshers_Quadrangle_2D.hxx \
StdMeshers_MEFISTO_2D.hxx \
- StdMeshers_Hexa_3D.hxx
+ StdMeshers_Hexa_3D.hxx \
+ StdMeshers_AutomaticLength.hxx \
+ StdMeshers_Distribution.hxx \
+ StdMeshers_QuadranglePreference.hxx
EXPORT_PYSCRIPTS =
EXPORT_PYSCRIPTS =
@@
-71,7
+73,10
@@
LIB_SRC = \
StdMeshers_Quadrangle_2D.cxx \
StdMeshers_MEFISTO_2D.cxx \
StdMeshers_Penta_3D.cxx \
StdMeshers_Quadrangle_2D.cxx \
StdMeshers_MEFISTO_2D.cxx \
StdMeshers_Penta_3D.cxx \
- StdMeshers_Hexa_3D.cxx
+ StdMeshers_Hexa_3D.cxx \
+ StdMeshers_AutomaticLength.cxx \
+ StdMeshers_Distribution.cxx \
+ StdMeshers_QuadranglePreference.cxx
LIB_SERVER_IDL =
LIB_SERVER_IDL =
@@
-85,6
+90,7
@@
BIN_SRC =
CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
-LDFLAGS+= -lSMESHimpl -lMEFISTO2D -L${CASROOT}/Linux/lib -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome
+LDFLAGS+= -lSMESHimpl -lMEFISTO2D $(OCC_LDPATH) -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome \
+ -lCASCatch
@CONCLUDE@
@CONCLUDE@