* Fails all call_scilab tests when one is failing 66/7266/2
Sylvestre Ledru [Fri, 25 May 2012 08:07:20 +0000 (10:07 +0200)]
* FLIBS explicit link has become necessary ? (as-needed probably)

Change-Id: I63f9429cb6d007407fb6654eb639a48f238a48c8

scilab/Makefile.call_scilab.am
scilab/Makefile.in

index 27bb1b4..1b7fb3d 100644 (file)
@@ -9,7 +9,8 @@
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 
-CALL_SCILAB_CFLAGS_COMMON = -I$(top_srcdir)/modules/call_scilab/includes/ -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/modules/api_scilab/includes/
+CALL_SCILAB_CFLAGS_COMMON = -I$(top_srcdir)/modules/call_scilab/includes/ -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/modules/api_scilab/includes/ $(FLIBS)
+
 CALL_SCILAB_LDADD_COMMON = $(top_builddir)/modules/libscilab.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/call_scilab/libscicall_scilab.la
 
 
@@ -30,7 +31,7 @@ check-call_scilab: $(check_PROGRAMS)
        for f in $(check_PROGRAMS); do \
                if test "$$f" != "call_scilab_c"; then \
                        echo "Run: LD_LIBRARY_PATH=$$LOCAL_LD SCI=$(top_srcdir) ./$$f"; \
-                       LD_LIBRARY_PATH=$$LOCAL_LD SCI=$(abs_top_builddir) ./$$f; \
+                       LD_LIBRARY_PATH=$$LOCAL_LD SCI=$(abs_top_builddir) ./$$f || exit 1; \
                fi \
        done
 
index 9398e00..b5976e2 100644 (file)
@@ -697,7 +697,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 # Files to install in Pkgconfig directory
 pkgconfig_DATA = scilab.pc
-CALL_SCILAB_CFLAGS_COMMON = -I$(top_srcdir)/modules/call_scilab/includes/ -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/modules/api_scilab/includes/
+CALL_SCILAB_CFLAGS_COMMON = -I$(top_srcdir)/modules/call_scilab/includes/ -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/modules/api_scilab/includes/ $(FLIBS)
 CALL_SCILAB_LDADD_COMMON = $(top_builddir)/modules/libscilab.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/call_scilab/libscicall_scilab.la
 call_scilab_c_SOURCES = $(top_srcdir)/modules/call_scilab/examples/call_scilab/c/common/myprog.c
 call_scilab_c_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
@@ -2015,7 +2015,7 @@ check-call_scilab: $(check_PROGRAMS)
        for f in $(check_PROGRAMS); do \
                if test "$$f" != "call_scilab_c"; then \
                        echo "Run: LD_LIBRARY_PATH=$$LOCAL_LD SCI=$(top_srcdir) ./$$f"; \
-                       LD_LIBRARY_PATH=$$LOCAL_LD SCI=$(abs_top_builddir) ./$$f; \
+                       LD_LIBRARY_PATH=$$LOCAL_LD SCI=$(abs_top_builddir) ./$$f || exit 1; \
                fi \
        done