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 BR_V5_IMP_P8
[modules/smesh.git]
/
src
/
Controls
/
Makefile.am
diff --git
a/src/Controls/Makefile.am
b/src/Controls/Makefile.am
index 18ea3d9c58a36b4d6c343ae98a06a902e0cf477d..0dd516e946bdda88f5cf355c50054aab1f0674b0 100644
(file)
--- a/
src/Controls/Makefile.am
+++ b/
src/Controls/Makefile.am
@@
-47,11
+47,12
@@
libSMESHControls_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \
$(BOOST_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \
$(CAS_CPPFLAGS) \
$(BOOST_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \
- -I$(srcdir)/../SMDS
+ -I$(srcdir)/../SMDS \
+ -I$(srcdir)/../SMESHDS
libSMESHControls_la_LDFLAGS = \
../SMDS/libSMDS.la \
libSMESHControls_la_LDFLAGS = \
../SMDS/libSMDS.la \
-
$(KERNEL_LDFLAGS) -lOpUtil
\
+
../SMESHDS/libSMESHDS.la
\
$(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d
SMESHControls_CPPFLAGS = \
$(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d
SMESHControls_CPPFLAGS = \
@@
-60,6
+61,7
@@
SMESHControls_CPPFLAGS = \
SMESHControls_LDADD = \
../SMDS/libSMDS.la \
SMESHControls_LDADD = \
../SMDS/libSMDS.la \
+ ../SMESHDS/libSMESHDS.la \
libSMESHControls.la \
$(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics \
$(GEOM_LDFLAGS) -lGEOMAlgo \
libSMESHControls.la \
$(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics \
$(GEOM_LDFLAGS) -lGEOMAlgo \