special_functions, statistics, xml must have a dynamic library, fix error message...

Change-Id: I460a1e4960af3f16bfabaa7405f949fe479259cd

diff --git a/scilab/modules/special_functions/Makefile.am b/scilab/modules/special_functions/Makefile.am
index a5fca9a..088b9e7 100644 (file)
--- a/scilab/modules/special_functions/Makefile.am
+++ b/scilab/modules/special_functions/Makefile.am
@@ -57,13 +57,9 @@ libscispecial_functions_la_CFLAGS=   -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
-if MAINTAINER_MODE
+
 pkglib_LTLIBRARIES = libscispecial_functions.la
 noinst_LTLIBRARIES = libscispecial_functions-algo.la
-else
-noinst_LTLIBRARIES = libscispecial_functions-algo.la libscispecial_functions.la
-endif
-
 
 libscispecial_functions_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 

diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index 89e9cb1..276fa84 100644 (file)
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -119,8 +119,6 @@ am_libscispecial_functions_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2) $(am__objects_3)
 libscispecial_functions_algo_la_OBJECTS =  \
        $(am_libscispecial_functions_algo_la_OBJECTS)
-@MAINTAINER_MODE_FALSE@am_libscispecial_functions_algo_la_rpath =
-@MAINTAINER_MODE_TRUE@am_libscispecial_functions_algo_la_rpath =
 libscispecial_functions_la_DEPENDENCIES =  \
        libscispecial_functions-algo.la
 am__objects_4 = libscispecial_functions_la-sci_dlgamma.lo \
@@ -147,9 +145,6 @@ libscispecial_functions_la_LINK = $(LIBTOOL) --tag=F77 \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \
        $(libscispecial_functions_la_FFLAGS) $(FFLAGS) \
        $(libscispecial_functions_la_LDFLAGS) $(LDFLAGS) -o $@
-@MAINTAINER_MODE_FALSE@am_libscispecial_functions_la_rpath =
-@MAINTAINER_MODE_TRUE@am_libscispecial_functions_la_rpath = -rpath \
-@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -481,9 +476,8 @@ libscispecial_functions_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
-@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscispecial_functions.la
-@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscispecial_functions-algo.la libscispecial_functions.la
-@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscispecial_functions-algo.la
+pkglib_LTLIBRARIES = libscispecial_functions.la
+noinst_LTLIBRARIES = libscispecial_functions-algo.la
 libscispecial_functions_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscispecial_functions_algo_la_SOURCES = $(SPECIAL_FUNCTIONS_C_SOURCES) $(SPECIAL_FUNCTIONS_FORTRAN_SOURCES) $(SPECIAL_FUNCTIONS_CPP_SOURCES)
 libscispecial_functions_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) 
@@ -646,9 +640,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscispecial_functions-algo.la: $(libscispecial_functions_algo_la_OBJECTS) $(libscispecial_functions_algo_la_DEPENDENCIES) 
-       $(F77LINK) $(am_libscispecial_functions_algo_la_rpath) $(libscispecial_functions_algo_la_OBJECTS) $(libscispecial_functions_algo_la_LIBADD) $(LIBS)
+       $(F77LINK)  $(libscispecial_functions_algo_la_OBJECTS) $(libscispecial_functions_algo_la_LIBADD) $(LIBS)
 libscispecial_functions.la: $(libscispecial_functions_la_OBJECTS) $(libscispecial_functions_la_DEPENDENCIES) 
-       $(libscispecial_functions_la_LINK) $(am_libscispecial_functions_la_rpath) $(libscispecial_functions_la_OBJECTS) $(libscispecial_functions_la_LIBADD) $(LIBS)
+       $(libscispecial_functions_la_LINK) -rpath $(pkglibdir) $(libscispecial_functions_la_OBJECTS) $(libscispecial_functions_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)

diff --git a/scilab/modules/statistics/Makefile.am b/scilab/modules/statistics/Makefile.am
index 7b17195..57e6b04 100644 (file)
--- a/scilab/modules/statistics/Makefile.am
+++ b/scilab/modules/statistics/Makefile.am
@@ -87,12 +87,9 @@ libscistatistics_la_CFLAGS=          -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
-if MAINTAINER_MODE
+
 pkglib_LTLIBRARIES = libscistatistics.la
 noinst_LTLIBRARIES = libscistatistics-algo.la
-else
-noinst_LTLIBRARIES = libscistatistics-algo.la libscistatistics.la
-endif
 
 
 libscistatistics_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)

diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index feac883..257864b 100644 (file)
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -127,8 +127,6 @@ am_libscistatistics_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2)
 libscistatistics_algo_la_OBJECTS =  \
        $(am_libscistatistics_algo_la_OBJECTS)
-@MAINTAINER_MODE_FALSE@am_libscistatistics_algo_la_rpath =
-@MAINTAINER_MODE_TRUE@am_libscistatistics_algo_la_rpath =
 libscistatistics_la_DEPENDENCIES = libscistatistics-algo.la
 am__objects_3 = libscistatistics_la-gw_statistics.lo \
        libscistatistics_la-sci_cdfchi.lo \
@@ -148,9 +146,6 @@ libscistatistics_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscistatistics_la_CFLAGS) $(CFLAGS) \
        $(libscistatistics_la_LDFLAGS) $(LDFLAGS) -o $@
-@MAINTAINER_MODE_FALSE@am_libscistatistics_la_rpath =
-@MAINTAINER_MODE_TRUE@am_libscistatistics_la_rpath = -rpath \
-@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -513,9 +508,8 @@ libscistatistics_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
-@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscistatistics.la
-@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscistatistics-algo.la libscistatistics.la
-@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscistatistics-algo.la
+pkglib_LTLIBRARIES = libscistatistics.la
+noinst_LTLIBRARIES = libscistatistics-algo.la
 libscistatistics_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscistatistics_algo_la_SOURCES = $(STATISTICS_C_SOURCES) $(STATISTICS_FORTRAN_SOURCES)
 libscistatistics_la_SOURCES = $(GATEWAY_C_SOURCES)
@@ -678,9 +672,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscistatistics-algo.la: $(libscistatistics_algo_la_OBJECTS) $(libscistatistics_algo_la_DEPENDENCIES) 
-       $(F77LINK) $(am_libscistatistics_algo_la_rpath) $(libscistatistics_algo_la_OBJECTS) $(libscistatistics_algo_la_LIBADD) $(LIBS)
+       $(F77LINK)  $(libscistatistics_algo_la_OBJECTS) $(libscistatistics_algo_la_LIBADD) $(LIBS)
 libscistatistics.la: $(libscistatistics_la_OBJECTS) $(libscistatistics_la_DEPENDENCIES) 
-       $(libscistatistics_la_LINK) $(am_libscistatistics_la_rpath) $(libscistatistics_la_OBJECTS) $(libscistatistics_la_LIBADD) $(LIBS)
+       $(libscistatistics_la_LINK) -rpath $(pkglibdir) $(libscistatistics_la_OBJECTS) $(libscistatistics_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)

diff --git a/scilab/modules/xml/Makefile.am b/scilab/modules/xml/Makefile.am
index 276b552..7c6daa5 100644 (file)
--- a/scilab/modules/xml/Makefile.am
+++ b/scilab/modules/xml/Makefile.am
@@ -99,12 +99,9 @@ libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/fileio/includes \
     $(XML_FLAGS)
 
-if MAINTAINER_MODE
+
 pkglib_LTLIBRARIES = libscixml.la 
 noinst_LTLIBRARIES = libscixml-algo.la 
-else
-noinst_LTLIBRARIES = libscixml-algo.la libscixml.la 
-endif
 
 libscixml_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
 

diff --git a/scilab/modules/xml/Makefile.in b/scilab/modules/xml/Makefile.in
index 1de014a..a65f069 100644 (file)
--- a/scilab/modules/xml/Makefile.in
+++ b/scilab/modules/xml/Makefile.in
@@ -133,8 +133,6 @@ am__objects_3 = libscixml_algo_la-VariableScope.lo \
 am_libscixml_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
        $(am__objects_3)
 libscixml_algo_la_OBJECTS = $(am_libscixml_algo_la_OBJECTS)
-@MAINTAINER_MODE_FALSE@am_libscixml_algo_la_rpath =
-@MAINTAINER_MODE_TRUE@am_libscixml_algo_la_rpath =
 libscixml_la_DEPENDENCIES = libscixml-algo.la
 am__objects_4 = libscixml_la-gw_xml.lo
 am__objects_5 = libscixml_la-sci_xmlRead.lo \
@@ -168,8 +166,6 @@ libscixml_la_OBJECTS = $(am_libscixml_la_OBJECTS)
 libscixml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(libscixml_la_LDFLAGS) $(LDFLAGS) -o $@
-@MAINTAINER_MODE_FALSE@am_libscixml_la_rpath =
-@MAINTAINER_MODE_TRUE@am_libscixml_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -593,9 +589,8 @@ libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/fileio/includes \
     $(XML_FLAGS)
 
-@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscixml.la 
-@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscixml-algo.la libscixml.la 
-@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscixml-algo.la 
+pkglib_LTLIBRARIES = libscixml.la 
+noinst_LTLIBRARIES = libscixml-algo.la 
 libscixml_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
 libscixml_algo_la_SOURCES = $(XML_C_SOURCES) $(XML_JNI_SOURCES) $(XML_CPP_SOURCES)
 libscixml_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) 
@@ -688,9 +683,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscixml-algo.la: $(libscixml_algo_la_OBJECTS) $(libscixml_algo_la_DEPENDENCIES) 
-       $(CXXLINK) $(am_libscixml_algo_la_rpath) $(libscixml_algo_la_OBJECTS) $(libscixml_algo_la_LIBADD) $(LIBS)
+       $(CXXLINK)  $(libscixml_algo_la_OBJECTS) $(libscixml_algo_la_LIBADD) $(LIBS)
 libscixml.la: $(libscixml_la_OBJECTS) $(libscixml_la_DEPENDENCIES) 
-       $(libscixml_la_LINK) $(am_libscixml_la_rpath) $(libscixml_la_OBJECTS) $(libscixml_la_LIBADD) $(LIBS)
+       $(libscixml_la_LINK) -rpath $(pkglibdir) $(libscixml_la_OBJECTS) $(libscixml_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)