Force the usage of the linker options. In particular no-as-needed (these libraries... 08/12908/2
Sylvestre Ledru [Mon, 14 Oct 2013 10:35:52 +0000 (12:35 +0200)]
Change-Id: I4c6666e01310470cd3349a577600f087515f93aa

scilab/modules/Makefile.am
scilab/modules/Makefile.in

index 35e0f1d..5440ccb 100644 (file)
@@ -121,7 +121,7 @@ libscilab_la_rootdir = $(mydatadir)
 pkglib_LTLIBRARIES = libscilab-cli.la libscilab.la
 libscilab_la_SOURCES =
 
-libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS)
+libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS) $(SCI_LDFLAGS)
 
 
 GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
@@ -238,7 +238,7 @@ libscilab_la_LIBADD += $(top_builddir)/modules/libscilab-cli.la
 
 libscilab_cli_la_SOURCES =
 
-libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS)
+libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS) $(SCI_LDFLAGS)
 
 # Core modules
 libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
index 3752300..c31cadc 100644 (file)
@@ -590,7 +590,7 @@ libscilab_la_rootdir = $(mydatadir)
 # libscilab-cli is for scilab-cli (without GUI)
 pkglib_LTLIBRARIES = libscilab-cli.la libscilab.la
 libscilab_la_SOURCES = 
-libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS)
+libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS) $(SCI_LDFLAGS)
 GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/renderer/libscirenderer.la \
        $(top_builddir)/modules/graphics/libscigraphics.la \
@@ -684,7 +684,7 @@ libscilab_la_LIBADD = $(am__append_6) $(am__append_7) $(OTHER_LIBS) \
 
 ################## libscilab-cli  ##################
 libscilab_cli_la_SOURCES = 
-libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS)
+libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS) $(SCI_LDFLAGS)
 
 # Core modules
 libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)