Linux compilation: add FLIBS to modules depending on fortran compilers

This allows to static links libgfortran.a and libquadmath.a to these
libraries. Be sure to static link libraries with -fPIC !

Change-Id: I8c65792b80382324b0e4f041ab1c3d842ebcbc22

diff --git a/scilab/modules/cacsd/Makefile.am b/scilab/modules/cacsd/Makefile.am
index f4ae3c7..d0222d6 100644 (file)
--- a/scilab/modules/cacsd/Makefile.am
+++ b/scilab/modules/cacsd/Makefile.am
@@ -225,8 +225,7 @@ CHECK_SRC= $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscicacsd_la_CPPFLAGS)
 
 
-libscicacsd_la_LIBADD = libscicacsd-algo.la $(ATLAS_LIBS)
-
+libscicacsd_la_LIBADD = libscicacsd-algo.la $(FLIBS)
 
 #### Target ######
 modulename=cacsd

diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 85959b1..c9d09e6 100644 (file)
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -862,7 +862,7 @@ libscicacsd_algo_la_CPPFLAGS = $(libscicacsd_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscicacsd_la_CPPFLAGS)
-libscicacsd_la_LIBADD = libscicacsd-algo.la $(ATLAS_LIBS)
+libscicacsd_la_LIBADD = libscicacsd-algo.la $(FLIBS)
 
 #### Target ######
 modulename = cacsd

diff --git a/scilab/modules/core/Makefile.am b/scilab/modules/core/Makefile.am
index 6838250..34c4712 100644 (file)
--- a/scilab/modules/core/Makefile.am
+++ b/scilab/modules/core/Makefile.am
@@ -203,7 +203,7 @@ libscicore_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 libscicore_algo_la_CPPFLAGS = $(libscicore_la_CPPFLAGS)
 
 # Commented because it is easier to comment first the core module
-libscicore_la_LIBADD = libscicore-algo.la $(XML_LIBS)
+libscicore_la_LIBADD = libscicore-algo.la $(XML_LIBS) $(FLIBS)
 
 #### Target ######
 modulename=core

diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index bea4444..40da443 100644 (file)
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -895,7 +895,7 @@ libscicore_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 libscicore_algo_la_CPPFLAGS = $(libscicore_la_CPPFLAGS)
 
 # Commented because it is easier to comment first the core module
-libscicore_la_LIBADD = libscicore-algo.la $(XML_LIBS)
+libscicore_la_LIBADD = libscicore-algo.la $(XML_LIBS) $(FLIBS)
 
 #### Target ######
 modulename = core

diff --git a/scilab/modules/differential_equations/Makefile.am b/scilab/modules/differential_equations/Makefile.am
index f349674..b37e64d 100644 (file)
--- a/scilab/modules/differential_equations/Makefile.am
+++ b/scilab/modules/differential_equations/Makefile.am
@@ -143,7 +143,7 @@ libscidifferential_equations_algo_la_CPPFLAGS = $(libscidifferential_equations_l
 CHECK_SRC= $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(DIFFERENTIAL_EQUATIONS_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscidifferential_equations_la_CPPFLAGS)
 
-libscidifferential_equations_la_LIBADD = libscidifferential_equations-algo.la
+libscidifferential_equations_la_LIBADD = libscidifferential_equations-algo.la $(FLIBS)
 
 
 #### Target ######

diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index f6628cd..b3dc7b1 100644 (file)
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -767,7 +767,7 @@ libscidifferential_equations_algo_la_CPPFLAGS = $(libscidifferential_equations_l
 # For the code check (splint)
 CHECK_SRC = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(DIFFERENTIAL_EQUATIONS_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscidifferential_equations_la_CPPFLAGS)
-libscidifferential_equations_la_LIBADD = libscidifferential_equations-algo.la
+libscidifferential_equations_la_LIBADD = libscidifferential_equations-algo.la $(FLIBS)
 
 #### Target ######
 modulename = differential_equations

diff --git a/scilab/modules/elementary_functions/Makefile.am b/scilab/modules/elementary_functions/Makefile.am
index f069bb8..5a42e1f 100644 (file)
--- a/scilab/modules/elementary_functions/Makefile.am
+++ b/scilab/modules/elementary_functions/Makefile.am
@@ -396,7 +396,7 @@ libscielementary_functions_algo_la_CPPFLAGS = $(libscielementary_functions_la_CP
 CHECK_SRC= $(ELEMENTARIES_FUNCTIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscielementary_functions_la_CPPFLAGS)
 
-libscielementary_functions_la_LIBADD = libdummy-elementary_functions.la libscielementary_functions-algo.la
+libscielementary_functions_la_LIBADD = libdummy-elementary_functions.la libscielementary_functions-algo.la $(FLIBS)
 
 # Following lines are extracted from a processed Makefile.in
 # Take care while modifying : append -O0 after all commons options

diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 848f9a7..6dd84db 100644 (file)
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -1190,7 +1190,7 @@ libscielementary_functions_algo_la_CPPFLAGS = $(libscielementary_functions_la_CP
 # For the code check (splint)
 CHECK_SRC = $(ELEMENTARIES_FUNCTIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscielementary_functions_la_CPPFLAGS)
-libscielementary_functions_la_LIBADD = libdummy-elementary_functions.la libscielementary_functions-algo.la
+libscielementary_functions_la_LIBADD = libdummy-elementary_functions.la libscielementary_functions-algo.la $(FLIBS)
 
 #### Target ######
 modulename = elementary_functions

diff --git a/scilab/modules/interpolation/Makefile.am b/scilab/modules/interpolation/Makefile.am
index 36ba401..4708b2e 100644 (file)
--- a/scilab/modules/interpolation/Makefile.am
+++ b/scilab/modules/interpolation/Makefile.am
@@ -62,7 +62,8 @@ CHECK_SRC= $(INTERPOLATION_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 INCLUDE_FLAGS = $(libsciinterpolation_la_CFLAGS)
 
 libsciinterpolation_la_LIBADD = \
-       libsciinterpolation-algo.la
+       libsciinterpolation-algo.la \
+        $(FLIBS)
 
 #### Target ######
 modulename=interpolation

diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index 45ce209..f8049ae 100644 (file)
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -640,7 +640,8 @@ libsciinterpolation_algo_la_CPPFLAGS = $(libsciinterpolation_la_CPPFLAGS)
 CHECK_SRC = $(INTERPOLATION_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 INCLUDE_FLAGS = $(libsciinterpolation_la_CFLAGS)
 libsciinterpolation_la_LIBADD = \
-       libsciinterpolation-algo.la
+       libsciinterpolation-algo.la \
+       $(FLIBS)
 
 
 #### Target ######

diff --git a/scilab/modules/linear_algebra/Makefile.am b/scilab/modules/linear_algebra/Makefile.am
index 2e15bca..918f24b 100644 (file)
--- a/scilab/modules/linear_algebra/Makefile.am
+++ b/scilab/modules/linear_algebra/Makefile.am
@@ -87,7 +87,7 @@ libscilinear_algebra_algo_la_CPPFLAGS = $(libscilinear_algebra_la_CPPFLAGS)
 CHECK_SRC= $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscilinear_algebra_la_CPPFLAGS)
 
-libscilinear_algebra_la_LIBADD = libscilinear_algebra-algo.la
+libscilinear_algebra_la_LIBADD = libscilinear_algebra-algo.la $(FLIBS)
 
 #### Target ######
 modulename=linear_algebra

diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index b8946d0..064d591 100644 (file)
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -686,7 +686,7 @@ libscilinear_algebra_algo_la_CPPFLAGS = $(libscilinear_algebra_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscilinear_algebra_la_CPPFLAGS)
-libscilinear_algebra_la_LIBADD = libscilinear_algebra-algo.la
+libscilinear_algebra_la_LIBADD = libscilinear_algebra-algo.la $(FLIBS)
 
 #### Target ######
 modulename = linear_algebra

diff --git a/scilab/modules/optimization/Makefile.am b/scilab/modules/optimization/Makefile.am
index 7198a67..a73d5fd 100644 (file)
--- a/scilab/modules/optimization/Makefile.am
+++ b/scilab/modules/optimization/Makefile.am
@@ -143,7 +143,7 @@ libscioptimization_algo_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_CP
 libscioptimization_la_SOURCES = $(GATEWAY_CPP_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 libscioptimization_algo_la_CPPFLAGS = $(libscioptimization_la_CPPFLAGS)
 
-libscioptimization_la_LIBADD = libscioptimization-algo.la
+libscioptimization_la_LIBADD = libscioptimization-algo.la $(FLIBS)
 
 
 #### Target ######

diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index 62bf824..670c490 100644 (file)
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -759,7 +759,7 @@ noinst_LTLIBRARIES = libscioptimization-algo.la
 libscioptimization_algo_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_CPP_SOURCES) $(OPTIMIZATION_FORTRAN_SOURCES) $(MINPACK_SOURCES)
 libscioptimization_la_SOURCES = $(GATEWAY_CPP_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 libscioptimization_algo_la_CPPFLAGS = $(libscioptimization_la_CPPFLAGS)
-libscioptimization_la_LIBADD = libscioptimization-algo.la
+libscioptimization_la_LIBADD = libscioptimization-algo.la $(FLIBS)
 
 #### Target ######
 modulename = optimization

diff --git a/scilab/modules/output_stream/Makefile.am b/scilab/modules/output_stream/Makefile.am
index 34e2835..d310fe3 100644 (file)
--- a/scilab/modules/output_stream/Makefile.am
+++ b/scilab/modules/output_stream/Makefile.am
@@ -100,7 +100,7 @@ libscioutput_stream_algo_la_CPPFLAGS = $(libscioutput_stream_la_CPPFLAGS)
 CHECK_SRC= $(OUTPUT_STREAM_C_SOURCES) $(OUTPUT_STREAM_CPP_SOURCES) $(OUTPUT_STREAM_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscioutput_stream_la_CPPFLAGS)
 
-libscioutput_stream_la_LIBADD =  libscioutput_stream-algo.la
+libscioutput_stream_la_LIBADD =  libscioutput_stream-algo.la $(FLIBS)
 
 #### Target ######
 modulename=output_stream

diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index 4eeb562..5e0a1c1 100644 (file)
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -698,7 +698,7 @@ libscioutput_stream_algo_la_CPPFLAGS = $(libscioutput_stream_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(OUTPUT_STREAM_C_SOURCES) $(OUTPUT_STREAM_CPP_SOURCES) $(OUTPUT_STREAM_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscioutput_stream_la_CPPFLAGS)
-libscioutput_stream_la_LIBADD = libscioutput_stream-algo.la
+libscioutput_stream_la_LIBADD = libscioutput_stream-algo.la $(FLIBS)
 
 #### Target ######
 modulename = output_stream

diff --git a/scilab/modules/polynomials/Makefile.am b/scilab/modules/polynomials/Makefile.am
index b4582fc..0bce159 100644 (file)
--- a/scilab/modules/polynomials/Makefile.am
+++ b/scilab/modules/polynomials/Makefile.am
@@ -118,7 +118,7 @@ libscipolynomials_algo_la_CPPFLAGS = $(libscipolynomials_la_CPPFLAGS)
 CHECK_SRC= ) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscipolynomials_la_CPPFLAGS)
 
-libscipolynomials_la_LIBADD = libscipolynomials-algo.la
+libscipolynomials_la_LIBADD = libscipolynomials-algo.la $(FLIBS)
 
 #### Target ######
 modulename=polynomials

diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index b618540..ec2f3f2 100644 (file)
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -722,7 +722,7 @@ libscipolynomials_algo_la_CPPFLAGS = $(libscipolynomials_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = ) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscipolynomials_la_CPPFLAGS)
-libscipolynomials_la_LIBADD = libscipolynomials-algo.la
+libscipolynomials_la_LIBADD = libscipolynomials-algo.la $(FLIBS)
 
 #### Target ######
 modulename = polynomials

diff --git a/scilab/modules/scicos/Makefile.am b/scilab/modules/scicos/Makefile.am
index 609d50a..8efca98 100644 (file)
--- a/scilab/modules/scicos/Makefile.am
+++ b/scilab/modules/scicos/Makefile.am
@@ -179,8 +179,8 @@ endif
 libsciscicos_algo_la_LIBADD =  \
                $(RT_LIB) \
                $(LIBXML_LIBS)
-libsciscicos_cli_la_LIBADD = libsciscicos-algo.la
-libsciscicos_la_LIBADD = libsciscicos-algo.la
+libsciscicos_cli_la_LIBADD = libsciscicos-algo.la $(FLIBS)
+libsciscicos_la_LIBADD = libsciscicos-algo.la $(FLIBS)
 if XCOS
 libsciscicos_cli_la_LIBADD += libscisundials.la \
     $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks-cli.la

diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 7b0852a..adbe409 100644 (file)
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -1092,8 +1092,8 @@ libsciscicos_algo_la_LIBADD = \
                $(RT_LIB) \
                $(LIBXML_LIBS)
 
-libsciscicos_cli_la_LIBADD = libsciscicos-algo.la $(am__append_2)
-libsciscicos_la_LIBADD = libsciscicos-algo.la $(am__append_3)
+libsciscicos_cli_la_LIBADD = libsciscicos-algo.la $(am__append_2) $(FLIBS)
+libsciscicos_la_LIBADD = libsciscicos-algo.la $(am__append_3) $(FLIBS)
 
 # For the code check (splint)
 CHECK_SRC = $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES)

diff --git a/scilab/modules/scicos_blocks/Makefile.am b/scilab/modules/scicos_blocks/Makefile.am
index ff1cd8a..5361eba 100644 (file)
--- a/scilab/modules/scicos_blocks/Makefile.am
+++ b/scilab/modules/scicos_blocks/Makefile.am
@@ -482,9 +482,9 @@ libsciscicos_blocks_la_LIBADD += libsciscicos_blocks-algo.la
 endif
 endif
 
-libsciscicos_blocks_algo_la_LIBADD += $(RT_LIB)
-libsciscicos_blocks_la_LIBADD += $(RT_LIB)
-libsciscicos_blocks_cli_la_LIBADD += $(RT_LIB)
+libsciscicos_blocks_algo_la_LIBADD += $(RT_LIB) $(FLIBS)
+libsciscicos_blocks_la_LIBADD += $(RT_LIB) $(FLIBS)
+libsciscicos_blocks_cli_la_LIBADD += $(RT_LIB) $(FLIBS)
 
 # For the code check (splint)
 CHECK_SRC= $(SCICOS_BLOCKS_C_SOURCES) $(NON_BLOCK_C_SOURCES)

diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 0094b53..064d7ee 100644 (file)
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -1410,9 +1410,9 @@ libsciscicos_blocks_algo_la_SOURCES = \
 
 libsciscicos_blocks_cli_la_SOURCES = $(am__append_2)
 libsciscicos_blocks_la_SOURCES = $(am__append_4)
-libsciscicos_blocks_algo_la_LIBADD = $(RT_LIB)
-libsciscicos_blocks_la_LIBADD = $(am__append_5) $(RT_LIB)
-libsciscicos_blocks_cli_la_LIBADD = $(am__append_3) $(RT_LIB)
+libsciscicos_blocks_algo_la_LIBADD = $(RT_LIB) $(FLIBS)
+libsciscicos_blocks_la_LIBADD = $(am__append_5) $(RT_LIB) $(FLIBS)
+libsciscicos_blocks_cli_la_LIBADD = $(am__append_3) $(RT_LIB) $(FLIBS)
 
 # For the code check (splint)
 CHECK_SRC = $(SCICOS_BLOCKS_C_SOURCES) $(NON_BLOCK_C_SOURCES)

diff --git a/scilab/modules/signal_processing/Makefile.am b/scilab/modules/signal_processing/Makefile.am
index 1829ec3..62c616f 100644 (file)
--- a/scilab/modules/signal_processing/Makefile.am
+++ b/scilab/modules/signal_processing/Makefile.am
@@ -120,7 +120,7 @@ libscisignal_processing_algo_la_CPPFLAGS = $(libscisignal_processing_la_CPPFLAGS
 CHECK_SRC= $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES) $(SIGNAL_PROCESSING_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscisignal_processing_la_CPPFLAGS)
 
-libscisignal_processing_la_LIBADD = libscisignal_processing-algo.la
+libscisignal_processing_la_LIBADD = libscisignal_processing-algo.la $(FLIBS)
 
 #### Target ######
 modulename=signal_processing

diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index c6b4838..2fb5736 100644 (file)
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -723,7 +723,7 @@ libscisignal_processing_algo_la_CPPFLAGS = $(libscisignal_processing_la_CPPFLAGS
 # For the code check (splint)
 CHECK_SRC = $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES) $(SIGNAL_PROCESSING_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscisignal_processing_la_CPPFLAGS)
-libscisignal_processing_la_LIBADD = libscisignal_processing-algo.la
+libscisignal_processing_la_LIBADD = libscisignal_processing-algo.la $(FLIBS)
 
 #### Target ######
 modulename = signal_processing

diff --git a/scilab/modules/sparse/Makefile.am b/scilab/modules/sparse/Makefile.am
index bde5062..ded7394 100644 (file)
--- a/scilab/modules/sparse/Makefile.am
+++ b/scilab/modules/sparse/Makefile.am
@@ -87,7 +87,7 @@ libscisparse_algo_la_CPPFLAGS = $(libscisparse_la_CPPFLAGS)
 CHECK_SRC = $(SPARSE_C_SOURCES)
 INCLUDE_FLAGS = $(libscisparse_la_CPPFLAGS)
 
-libscisparse_la_LIBADD = libscisparse-algo.la
+libscisparse_la_LIBADD = libscisparse-algo.la $(FLIBS)
 
 #### Target ######
 modulename=sparse

diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index cc6425a..565720a 100644 (file)
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -681,7 +681,7 @@ libscisparse_algo_la_CPPFLAGS = $(libscisparse_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(SPARSE_C_SOURCES)
 INCLUDE_FLAGS = $(libscisparse_la_CPPFLAGS)
-libscisparse_la_LIBADD = libscisparse-algo.la
+libscisparse_la_LIBADD = libscisparse-algo.la $(FLIBS)
 
 #### Target ######
 modulename = sparse

diff --git a/scilab/modules/special_functions/Makefile.am b/scilab/modules/special_functions/Makefile.am
index 50a9620..118cd73 100644 (file)
--- a/scilab/modules/special_functions/Makefile.am
+++ b/scilab/modules/special_functions/Makefile.am
@@ -75,7 +75,7 @@ libscispecial_functions_algo_la_CPPFLAGS = $(libscispecial_functions_la_CPPFLAGS
 CHECK_SRC= $(SPECIAL_FUNCTIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscispecial_functions_la_CPPFLAGS)
 
-libscispecial_functions_la_LIBADD = libscispecial_functions-algo.la
+libscispecial_functions_la_LIBADD = libscispecial_functions-algo.la $(FLIBS)
 
 #### Target ######
 modulename=special_functions

diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index af316a1..4f90ffd 100644 (file)
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -658,7 +658,7 @@ libscispecial_functions_algo_la_CPPFLAGS = $(libscispecial_functions_la_CPPFLAGS
 # For the code check (splint)
 CHECK_SRC = $(SPECIAL_FUNCTIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscispecial_functions_la_CPPFLAGS)
-libscispecial_functions_la_LIBADD = libscispecial_functions-algo.la
+libscispecial_functions_la_LIBADD = libscispecial_functions-algo.la $(FLIBS)
 
 #### Target ######
 modulename = special_functions

diff --git a/scilab/modules/statistics/Makefile.am b/scilab/modules/statistics/Makefile.am
index d265b8a..87ab4c4 100644 (file)
--- a/scilab/modules/statistics/Makefile.am
+++ b/scilab/modules/statistics/Makefile.am
@@ -116,7 +116,7 @@ libscistatistics_algo_la_CPPFLAGS = $(libscistatistics_la_CPPFLAGS)
 CHECK_SRC= $(STATISTICS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscistatistics_la_CPPFLAGS)
 
-libscistatistics_la_LIBADD = libscistatistics-algo.la 
+libscistatistics_la_LIBADD = libscistatistics-algo.la $(FLIBS)
 
 #### Target ######
 modulename=statistics

diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index ed17e0f..9fd8a58 100644 (file)
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -700,7 +700,7 @@ libscistatistics_algo_la_CPPFLAGS = $(libscistatistics_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(STATISTICS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscistatistics_la_CPPFLAGS)
-libscistatistics_la_LIBADD = libscistatistics-algo.la 
+libscistatistics_la_LIBADD = libscistatistics-algo.la $(FLIBS)
 
 #### Target ######
 modulename = statistics