Merge from V6_main (patch ubuntu)

diff --git a/src/DSCCODAENG/Makefile.am b/src/DSCCODAENG/Makefile.am
index cd29b7172ab92629f4b6872ae403f776149445b7..474311e83c6966e9f2d876d192aa96733efbe1ed 100644 (file)
--- a/src/DSCCODAENG/Makefile.am
+++ b/src/DSCCODAENG/Makefile.am
@@ -4,6 +4,6 @@ salomelib_LTLIBRARIES = libDSCCODAEngine.la
 libDSCCODAEngine_la_SOURCES      = DSCCODAENG.cxx
 nodist_libDSCCODAEngine_la_SOURCES = 
 libDSCCODAEngine_la_CXXFLAGS = -I$(top_builddir)/idl  $(KERNEL_INCLUDES) 
-libDSCCODAEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE 
+libDSCCODAEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE $(KERNEL_LIBS)
 salomeinclude_HEADERS = DSCCODAENG.hxx
 

diff --git a/src/DSCCODBENG/Makefile.am b/src/DSCCODBENG/Makefile.am
index e5cbf18e5f3f8f961424721abc7f2f95df852b13..1028166d67c0f26e513bea201995fda12891b4be 100644 (file)
--- a/src/DSCCODBENG/Makefile.am
+++ b/src/DSCCODBENG/Makefile.am
@@ -5,5 +5,5 @@ salomeinclude_HEADERS = DSCCODBENG.hxx
 libDSCCODBEngine_la_SOURCES      = DSCCODBENG.cxx
 nodist_libDSCCODBEngine_la_SOURCES = 
 libDSCCODBEngine_la_CXXFLAGS     = -I$(top_builddir)/idl  $(KERNEL_INCLUDES)
-libDSCCODBEngine_la_LIBADD     = -L$(top_builddir)/idl -lDSCCODE
+libDSCCODBEngine_la_LIBADD     = -L$(top_builddir)/idl -lDSCCODE $(KERNEL_LIBS)
 

diff --git a/src/DSCCODCENG/Makefile.am b/src/DSCCODCENG/Makefile.am
index 71637b50648c397c9dae76e2a122fd7824ddadf3..d63e20bf96ffe045bff94725f23d09e9970d8b1b 100644 (file)
--- a/src/DSCCODCENG/Makefile.am
+++ b/src/DSCCODCENG/Makefile.am
@@ -5,5 +5,5 @@ salomeinclude_HEADERS = DSCCODCENG.hxx
 libDSCCODCEngine_la_SOURCES      = DSCCODCENG.cxx
 nodist_libDSCCODCEngine_la_SOURCES = 
 libDSCCODCEngine_la_CXXFLAGS     = -I$(top_builddir)/idl  $(KERNEL_INCLUDES) 
-libDSCCODCEngine_la_LIBADD     = -L$(top_builddir)/idl -lDSCCODE
+libDSCCODCEngine_la_LIBADD     = -L$(top_builddir)/idl -lDSCCODE $(KERNEL_LIBS)
 

diff --git a/src/DSCCODDENG/Makefile.am b/src/DSCCODDENG/Makefile.am
index 6dc5b6f932800f731dcb55b3d5dfe1d959363782..58114d674d7424f547ce9c3f2d878cbf08125a46 100644 (file)
--- a/src/DSCCODDENG/Makefile.am
+++ b/src/DSCCODDENG/Makefile.am
@@ -4,6 +4,6 @@ salomelib_LTLIBRARIES = libDSCCODDEngine.la
 libDSCCODDEngine_la_SOURCES      = DSCCODDENG.cxx
 nodist_libDSCCODDEngine_la_SOURCES = 
 libDSCCODDEngine_la_CXXFLAGS = -I$(top_builddir)/idl  $(KERNEL_INCLUDES) 
-libDSCCODDEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE 
+libDSCCODDEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE $(KERNEL_LIBS)
 salomeinclude_HEADERS = DSCCODDENG.hxx
 

diff --git a/src/FLUIDE/Makefile.am b/src/FLUIDE/Makefile.am
index b8dbb839da6d72ed6e84eb1767629d49851f31f7..2b947e093c8d37e8465b5f9b7ef084938264c2f2 100644 (file)
--- a/src/FLUIDE/Makefile.am
+++ b/src/FLUIDE/Makefile.am
@@ -7,6 +7,6 @@ libFLUIDEEngine_la_SOURCES      = FLUIDE.cxx fluide.f
 nodist_libFLUIDEEngine_la_SOURCES = 
 libFLUIDEEngine_la_CXXFLAGS = -I$(top_builddir)/idl  $(KERNEL_INCLUDES) 
 libFLUIDEEngine_la_FFLAGS = $(KERNEL_INCLUDES) -fexceptions
-libFLUIDEEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE $(FLIBS)
+libFLUIDEEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE $(FLIBS) $(KERNEL_LIBS)
 salomeinclude_HEADERS = FLUIDE.hxx
 

diff --git a/src/INTERPI/Makefile.am b/src/INTERPI/Makefile.am
index c6a6060b1edc280a5125fcf25093ecb0f8871f98..2c6813c01e82f575d9bcfaac0693bdbe2a7b4935 100644 (file)
--- a/src/INTERPI/Makefile.am
+++ b/src/INTERPI/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/adm_local/make_common_starter.am
 AM_CFLAGS=$(KERNEL_INCLUDES) -fexceptions
 AM_FFLAGS=$(KERNEL_INCLUDES) -fexceptions
 AM_CXXFLAGS = -I$(top_builddir)/idl  $(KERNEL_INCLUDES) 
-AM_LDFLAGS  = -L$(top_builddir)/idl -lDSCCODE $(FLIBS)
+AM_LDFLAGS  = -L$(top_builddir)/idl -lDSCCODE $(FLIBS) $(KERNEL_LIBS)
 
 salomelib_LTLIBRARIES = libINTERPIEngine.la libINTERPJEngine.la libINTERPKEngine.la
 

diff --git a/src/NEUTRO/Makefile.am b/src/NEUTRO/Makefile.am
index 213259caebefc2637efe8a0f2a1efa242157e4e0..845b48946de68430aaa46d61e6389094b87bd6bd 100644 (file)
--- a/src/NEUTRO/Makefile.am
+++ b/src/NEUTRO/Makefile.am
@@ -7,6 +7,6 @@ libNEUTROEngine_la_SOURCES      = NEUTRO.cxx neutro.f
 nodist_libNEUTROEngine_la_SOURCES = 
 libNEUTROEngine_la_CXXFLAGS = -I$(top_builddir)/idl  $(KERNEL_INCLUDES) 
 libNEUTROEngine_la_FFLAGS = $(KERNEL_INCLUDES)  -fexceptions
-libNEUTROEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE $(FLIBS)
+libNEUTROEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE $(FLIBS) $(KERNEL_LIBS)
 salomeinclude_HEADERS = NEUTRO.hxx
 

diff --git a/src/SOLIDE/Makefile.am b/src/SOLIDE/Makefile.am
index 3ab26c099c15629902b87a7344d8639c69779945..a12af49e86b51d0a32b50f9be97a245accaa5d10 100644 (file)
--- a/src/SOLIDE/Makefile.am
+++ b/src/SOLIDE/Makefile.am
@@ -7,6 +7,6 @@ libSOLIDEEngine_la_SOURCES      = SOLIDE.cxx solid.f
 nodist_libSOLIDEEngine_la_SOURCES = 
 libSOLIDEEngine_la_CXXFLAGS = -I$(top_builddir)/idl  $(KERNEL_INCLUDES) 
 libSOLIDEEngine_la_FFLAGS = $(KERNEL_INCLUDES)  -fexceptions
-libSOLIDEEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE $(FLIBS)
+libSOLIDEEngine_la_LIBADD   = -L$(top_builddir)/idl -lDSCCODE $(FLIBS) $(KERNEL_LIBS)
 salomeinclude_HEADERS = SOLIDE.hxx