Issue with blas ... only link against it when we use the embed version of blas
Sylvestre Ledru [Fri, 29 Feb 2008 09:32:35 +0000 (09:32 +0000)]
35 files changed:
scilab/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/metanet/Makefile.am
scilab/modules/metanet/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in

index 1e4df40..d1c7782 100644 (file)
@@ -49,10 +49,9 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(top_srcdir)/etc/modules.xml.in \
        $(top_srcdir)/modules/core/includes/machine.h.in \
        $(top_srcdir)/modules/helptools/macros/xmlfiletohtml.sci.in \
-       ABOUT-NLS COPYING config.guess config.sub config/compile \
-       config/config.guess config/config.rpath config/config.sub \
-       config/depcomp config/install-sh config/ltmain.sh \
-       config/missing depcomp install-sh missing
+       COPYING config/compile config/config.guess config/config.rpath \
+       config/config.sub config/depcomp config/install-sh \
+       config/ltmain.sh config/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
        $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
index 5d2fb6d..cde29fc 100644 (file)
@@ -181,8 +181,7 @@ $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la  \
 $(top_builddir)/libs/libst/libscilibst.la
 
 if USE_EMBEDDED_BLAS
-libscilab_la_LIBADD += \
-$(top_builddir)/libs/blas/libsciblas.la
+libscilab_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
 endif
 
 if USE_EMBEDDED_LAPACK
index 3d90ade..0d42d79 100644 (file)
@@ -58,9 +58,7 @@ host_triplet = @host@
 #endif
 @FFTW_TRUE@am__append_5 = $(top_builddir)/modules/fftw/libscifftw.la
 @SCICOS_TRUE@am__append_6 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
-@USE_EMBEDDED_BLAS_TRUE@am__append_7 = \
-@USE_EMBEDDED_BLAS_TRUE@$(top_builddir)/libs/blas/libsciblas.la
-
+@USE_EMBEDDED_BLAS_TRUE@am__append_7 = $(top_builddir)/libs/blas/libsciblas.la
 @USE_EMBEDDED_LAPACK_TRUE@am__append_8 = \
 @USE_EMBEDDED_LAPACK_TRUE@$(top_builddir)/libs/lapack/libscilapack.la
 
index 21c3ef5..3d08515 100644 (file)
@@ -78,7 +78,7 @@ libsciarnoldi_la_SOURCES =  $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
 # cyclic: $(top_builddir)/modules/core/libscicore.la 
 libsciarnoldi_la_LIBADD =  $(top_builddir)/libs/lapack/libscilapack.la
 if USE_EMBEDDED_BLAS
-libsciarnoldi_la_LIBADD += d$(top_builddir)/libs/blas/libsciblas.la
+libsciarnoldi_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
 endif
 
 #### Target ######
index 6aab673..c2dadaf 100644 (file)
@@ -47,7 +47,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@USE_EMBEDDED_BLAS_TRUE@am__append_1 = d$(top_builddir)/libs/blas/libsciblas.la
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
 DIST_COMMON = $(libsciarnoldi_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
index 374ed1e..7a65c42 100644 (file)
@@ -28,10 +28,11 @@ libsciboolean_la_SOURCES = $(BOOLEAN_C_SOURCES) $(BOOLEAN_FORTRAN_SOURCES) $(GAT
 
 libsciboolean_la_LIBADD = \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
 
-
+if USE_EMBEDDED_BLAS
+libsciboolean_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
+endif
 
 modulename=boolean
 
index 1b5cbbc..fb192ca 100644 (file)
@@ -47,12 +47,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
 DIST_COMMON = $(libsciboolean_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/boolean
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -86,8 +87,8 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciboolean_la_DEPENDENCIES =  \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(am__append_1)
 am__objects_1 = libsciboolean_la-matboolean.lo \
        libsciboolean_la-vect_or.lo libsciboolean_la-vect_and.lo
 am__objects_2 = logic.lo find.lo
@@ -326,11 +327,10 @@ libsciboolean_la_CFLAGS = -Iincludes/ \
 
 pkglib_LTLIBRARIES = libsciboolean.la
 libsciboolean_la_SOURCES = $(BOOLEAN_C_SOURCES) $(BOOLEAN_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libsciboolean_la_LIBADD = \
+libsciboolean_la_LIBADD =  \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
-
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(am__append_1)
 modulename = boolean
 
 #### boolean : Conf files ####
@@ -359,7 +359,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 17ec9ad..6f4a3d9 100644 (file)
@@ -223,9 +223,11 @@ libscicacsd_la_SOURCES = $(CACSD_FORTRAN_SOURCES) $(SLICOT_FORTRAN_SOURCES) $(GA
 libscicacsd_la_LDFLAGS = $(ATLAS_LIBS)
 
 # cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
-libscicacsd_la_LIBADD =  $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
-
+libscicacsd_la_LIBADD =  $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 
+if USE_EMBEDDED_BLAS
+libscicacsd_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
+endif
 
 
 #### Target ######
index 6649ffa..046a177 100644 (file)
@@ -47,11 +47,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
 DIST_COMMON = $(libscicacsd_la_include_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/cacsd
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -89,12 +90,11 @@ libscicacsd_la_DEPENDENCIES = $(top_builddir)/modules/mexlib/libmx.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
        $(top_builddir)/modules/mexlib/libmex.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/lapack/libscilapack.la
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 am__objects_1 = libscicacsd_la-riccpack.lo libscicacsd_la-jacl2.lo \
        libscicacsd_la-onface.lo libscicacsd_la-hhdml.lo \
        libscicacsd_la-tild.lo libscicacsd_la-degl2.lo \
@@ -624,7 +624,16 @@ libscicacsd_la_SOURCES = $(CACSD_FORTRAN_SOURCES) $(SLICOT_FORTRAN_SOURCES) $(GA
 libscicacsd_la_LDFLAGS = $(ATLAS_LIBS)
 
 # cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
-libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la \
+       $(top_builddir)/modules/mexlib/libmat.la \
+       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
+       $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
+       $(top_builddir)/modules/mexlib/libmex.la \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 
 #### Target ######
 modulename = cacsd
@@ -685,7 +694,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 34cf004..e968abb 100644 (file)
@@ -134,9 +134,11 @@ pkglib_LTLIBRARIES = libscidifferential_equations.la
 
 libscidifferential_equations_la_SOURCES = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(DIFFERENTIAL_EQUATIONS_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 
-libscidifferential_equations_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
-
+libscidifferential_equations_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 
+if USE_EMBEDDED_BLAS
+libscidifferential_equations_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
+endif
 
 #### Target ######
 modulename=differential_equations
index 832b4fa..1acb11b 100644 (file)
@@ -47,12 +47,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
 DIST_COMMON = $(libscidifferential_equations_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/differential_equations
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -86,13 +87,12 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscidifferential_equations_la_DEPENDENCIES =  \
        $(top_builddir)/modules/core/libscicore.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/string/libscistring.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/lapack/libscilapack.la
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 am__objects_1 = libscidifferential_equations_la-dassl.lo \
        libscidifferential_equations_la-feval.lo \
        libscidifferential_equations_la-fevaltable.lo \
@@ -476,7 +476,14 @@ libscidifferential_equations_la_CFLAGS = -Iincludes/ \
 
 pkglib_LTLIBRARIES = libscidifferential_equations.la
 libscidifferential_equations_la_SOURCES = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(DIFFERENTIAL_EQUATIONS_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscidifferential_equations_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscidifferential_equations_la_LIBADD =  \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+       $(top_builddir)/modules/string/libscistring.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 
 #### Target ######
 modulename = differential_equations
@@ -510,7 +517,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 48addc0..0dc1eed 100644 (file)
@@ -29,9 +29,11 @@ libscidouble_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes
 
 libscidouble_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 
-libscidouble_la_LIBADD =  $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
-
+libscidouble_la_LIBADD =  $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 
+if USE_EMBEDDED_BLAS
+libscidouble_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la 
+endif
 
 #### Target ######
 modulename=double
index daa472c..df17db4 100644 (file)
@@ -41,11 +41,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la 
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/double
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -76,7 +77,6 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscidouble_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/boolean/libsciboolean.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
@@ -84,7 +84,7 @@ libscidouble_la_DEPENDENCIES =  \
        $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/lapack/libscilapack.la
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 am__objects_1 = libscidouble_la-gw_double.lo
 am__objects_2 = vecldiv.lo vecmul.lo matxpow.lo vecimpl.lo matldiv.lo \
        matsubst.lo vecrdiv.lo matchsgn.lo matrdiv.lo matrc.lo \
@@ -321,7 +321,15 @@ sci_gateway/fortran/matadd.f
 pkglib_LTLIBRARIES = libscidouble.la
 libscidouble_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes
 libscidouble_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscidouble_la_LIBADD = $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscidouble_la_LIBADD =  \
+       $(top_builddir)/modules/boolean/libsciboolean.la \
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+       $(top_builddir)/modules/polynomials/libscipolynomials.la \
+       $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 
 #### Target ######
 modulename = double
@@ -342,7 +350,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 2149c37..71b3102 100644 (file)
@@ -411,7 +411,7 @@ libscigraphics_la_LDFLAGS =  $(JAVA_JNI_LIBS) $(TCLTK_LIBS) $(X_LIBS)
 
 libscigraphics_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES) $(GRAPHICS_CPP_SOURCES)
 
-libscigraphics_la_LIBADD =  $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscigraphics_la_LIBADD =  $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 if USE_EMBEDDED_BLAS
 libscigraphics_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
 endif
index 0c7d8f1..d38de65 100644 (file)
@@ -106,7 +106,6 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 @GUI_TRUE@     $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
 @GUI_TRUE@     $(top_builddir)/modules/renderer/libscirenderer.la \
 @GUI_TRUE@     $(top_builddir)/modules/tclsci/libscitclsci.la \
-@GUI_TRUE@     $(top_builddir)/libs/blas/libsciblas.la \
 @GUI_TRUE@     $(top_builddir)/modules/gui/libscigui.la \
 @GUI_TRUE@     $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
 @GUI_TRUE@     $(top_builddir)/modules/core/libscicore.la \
@@ -1466,7 +1465,6 @@ libscigraphics_la_CFLAGS =  \
 @GUI_TRUE@     $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
 @GUI_TRUE@     $(top_builddir)/modules/renderer/libscirenderer.la \
 @GUI_TRUE@     $(top_builddir)/modules/tclsci/libscitclsci.la \
-@GUI_TRUE@     $(top_builddir)/libs/blas/libsciblas.la \
 @GUI_TRUE@     $(top_builddir)/modules/gui/libscigui.la \
 @GUI_TRUE@     $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
 @GUI_TRUE@     $(top_builddir)/modules/core/libscicore.la \
index 1ed357c..0311f6c 100644 (file)
@@ -97,7 +97,11 @@ pkglib_LTLIBRARIES = libscilinear_algebra.la
 
 libscilinear_algebra_la_SOURCES = $(LINEAR_ALGEBRA_FORTRAN_SOURCES) $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 
-libscilinear_algebra_la_LIBADD =  $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscilinear_algebra_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+
+if USE_EMBEDDED_BLAS
+libscilinear_algebra_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la 
+endif
 
 #### Target ######
 modulename=linear_algebra
index 4fc6a28..6a6b588 100644 (file)
@@ -47,12 +47,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la 
 DIST_COMMON = $(libscilinear_algebra_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/linear_algebra
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -84,14 +85,12 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscilinear_algebra_la_includedir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libscilinear_algebra_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/blas/libsciblas.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+libscilinear_algebra_la_DEPENDENCIES = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/lapack/libscilapack.la
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 am__objects_1 = intdggbal.lo intzgeqpf4.lo intzheev.lo intzgehrd.lo \
        intzgesvd1.lo intzfschur.lo intzgesvd2.lo intdgges.lo \
        intdgeev.lo intgschur.lo intdgesv3.lo intdggev.lo intdgesv4.lo \
@@ -429,7 +428,12 @@ libscilinear_algebra_la_CFLAGS = -Iincludes/ \
 
 pkglib_LTLIBRARIES = libscilinear_algebra.la
 libscilinear_algebra_la_SOURCES = $(LINEAR_ALGEBRA_FORTRAN_SOURCES) $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscilinear_algebra_la_LIBADD = $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscilinear_algebra_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 
 #### Target ######
 modulename = linear_algebra
@@ -460,7 +464,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 6d170b4..17421f8 100644 (file)
@@ -125,8 +125,11 @@ pkglib_LTLIBRARIES = libscimetanet.la
 
 libscimetanet_la_SOURCES = $(METANET_C_SOURCES) $(METANET_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 
-libscimetanet_la_LIBADD =  $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscimetanet_la_LIBADD = $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 
+if USE_EMBEDDED_BLAS
+libscimetanet_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
+endif
 
 
 #### Target ######
index 0d5a74d..7b822c6 100644 (file)
@@ -47,12 +47,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
 DIST_COMMON = $(libscimetanet_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/metanet
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -87,12 +88,12 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscimetanet_la_DEPENDENCIES =  \
        $(top_builddir)/libs/hashtable/libscihashtable.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/intersci/libsciintersci.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(am__append_1)
 am__objects_1 = libscimetanet_la-paths.lo libscimetanet_la-dmtree.lo \
        libscimetanet_la-files.lo \
        libscimetanet_la-hashtable_metanet.lo \
@@ -454,7 +455,14 @@ libscimetanet_la_CFLAGS = -Iincludes/ \
 
 pkglib_LTLIBRARIES = libscimetanet.la
 libscimetanet_la_SOURCES = $(METANET_C_SOURCES) $(METANET_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscimetanet_la_LIBADD = $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscimetanet_la_LIBADD =  \
+       $(top_builddir)/libs/hashtable/libscihashtable.la \
+       $(top_builddir)/modules/intersci/libsciintersci.la \
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(am__append_1)
 
 #### Target ######
 modulename = metanet
@@ -507,7 +515,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 646d6c4..5225652 100644 (file)
@@ -143,9 +143,11 @@ pkglib_LTLIBRARIES = libscioptimization.la
 
 libscioptimization_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 
-libscioptimization_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
-
+libscioptimization_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 
+if USE_EMBEDDED_BLAS
+libscioptimization_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
+endif
 
 #### Target ######
 modulename=optimization
index f6b223e..789bb23 100644 (file)
@@ -47,12 +47,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
 DIST_COMMON = $(libscioptimization_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/optimization
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -87,13 +88,12 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscioptimization_la_DEPENDENCIES =  \
        $(top_builddir)/modules/core/libscicore.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/string/libscistring.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/lapack/libscilapack.la
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 am__objects_1 = libscioptimization_la-intqld.lo \
        libscioptimization_la-sp.lo \
        libscioptimization_la-fsolvetable.lo \
@@ -480,7 +480,14 @@ libscioptimization_la_CFLAGS = -Iincludes/ \
 #-Isrc/c/
 pkglib_LTLIBRARIES = libscioptimization.la
 libscioptimization_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscioptimization_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscioptimization_la_LIBADD =  \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+       $(top_builddir)/modules/string/libscistring.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 
 #### Target ######
 modulename = optimization
@@ -560,7 +567,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 7d32e42..1a8cdb4 100644 (file)
@@ -111,9 +111,11 @@ pkglib_LTLIBRARIES = libscipolynomials.la
 
 libscipolynomials_la_SOURCES = $(POLYNOMIALS_FORTRAN_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
 
-libscipolynomials_la_LIBADD =  $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
-
+libscipolynomials_la_LIBADD =  $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 
+if USE_EMBEDDED_BLAS
+libscipolynomials_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
+endif
 
 #### Target ######
 modulename=polynomials
index 8d62cb8..2ce8c12 100644 (file)
@@ -47,12 +47,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
 DIST_COMMON = $(libscipolynomials_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/polynomials
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -86,13 +87,12 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscipolynomials_la_DEPENDENCIES =  \
        $(top_builddir)/modules/cacsd/libscicacsd.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/lapack/libscilapack.la
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 am__objects_1 = residu.lo imptra.lo dmpadj.lo impins.lo dpmul1.lo \
        wprxc.lo dmpcnc.lo wmpmu.lo mpinsp.lo impext.lo bezout.lo \
        recbez.lo sfact1.lo dmptld.lo dpodiv.lo dmptra.lo dmpins.lo \
@@ -444,7 +444,14 @@ libscipolynomials_la_CFLAGS = -Iincludes/ \
 
 pkglib_LTLIBRARIES = libscipolynomials.la
 libscipolynomials_la_SOURCES = $(POLYNOMIALS_FORTRAN_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
-libscipolynomials_la_LIBADD = $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscipolynomials_la_LIBADD =  \
+       $(top_builddir)/modules/cacsd/libscicacsd.la \
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+       $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 
 #### Target ######
 modulename = polynomials
@@ -473,7 +480,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 15b9b3a..35455b1 100644 (file)
@@ -100,7 +100,11 @@ libsciscicos_la_CFLAGS= -Iincludes/ \
 
 libsciscicos_la_SOURCES = $(SCICOS_C_SOURCES) $(SCICOS_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 
-libsciscicos_la_LIBADD =  $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la
+libsciscicos_la_LIBADD =  $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la
+
+if USE_EMBEDDED_BLAS
+libsciscicos_la_LIBADD +=  $(top_builddir)/libs/blas/libsciblas.la 
+endif
 
 #### scicos : Conf files ####
 libsciscicos_la_rootdir = $(mydatadir)
index 44936af..0554c62 100644 (file)
@@ -49,12 +49,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@SCICOS_TRUE@@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la 
 DIST_COMMON = $(am__libsciscicos_la_include_HEADERS_DIST) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/scicos
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -94,7 +95,6 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 @SCICOS_TRUE@libsciscicos_la_DEPENDENCIES =  \
 @SCICOS_TRUE@  $(top_builddir)/modules/string/libscistring.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/mexlib/libmat.la \
-@SCICOS_TRUE@  $(top_builddir)/libs/blas/libsciblas.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/mexlib/libmx.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/intersci/libsciintersci.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/graphics/libscigraphics.la \
@@ -107,7 +107,8 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 @SCICOS_TRUE@  $(top_builddir)/modules/core/libscicore.la \
 @SCICOS_TRUE@  $(top_builddir)/libs/MALLOC/libscimalloc.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-@SCICOS_TRUE@  $(top_builddir)/modules/arnoldi/libsciarnoldi.la
+@SCICOS_TRUE@  $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+@SCICOS_TRUE@  $(am__append_1)
 am__libsciscicos_la_SOURCES_DIST = src/c/noscicos/noscicos.c \
        src/c/tree.c src/c/sciblk2i.c src/c/scicos_malloc.c \
        src/c/import.c src/c/scicosexit.c src/c/slider.c \
@@ -539,7 +540,23 @@ DISABLE_HELP_CLEAN = yes
 
 #libsciscicos_la_LDFLAGS = -lf2c
 @SCICOS_TRUE@libsciscicos_la_SOURCES = $(SCICOS_C_SOURCES) $(SCICOS_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-@SCICOS_TRUE@libsciscicos_la_LIBADD = $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la
+@SCICOS_TRUE@libsciscicos_la_LIBADD =  \
+@SCICOS_TRUE@  $(top_builddir)/modules/string/libscistring.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/mexlib/libmat.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/mexlib/libmx.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/intersci/libsciintersci.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/graphics/libscigraphics.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/time/libscitime.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/scicos/libscisundials.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/mexlib/libmex.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/core/libscicore.la \
+@SCICOS_TRUE@  $(top_builddir)/libs/MALLOC/libscimalloc.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+@SCICOS_TRUE@  $(am__append_1)
 
 #### scicos : Conf files ####
 @SCICOS_TRUE@libsciscicos_la_rootdir = $(mydatadir)
@@ -697,7 +714,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index b378ecc..a02dfc2 100644 (file)
@@ -425,7 +425,12 @@ includes/blocks.h: build/Cblocknames build/Fblocknames
 CLEANFILES=$(top_srcdir)/modules/scicos_blocks/includes/blocks.h $(top_srcdir)/modules/scicos_blocks/build/Cblocknames $(top_srcdir)/modules/scicos_blocks/build/Fblocknames
 
 # cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la
-libsciscicos_blocks_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la  $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libsciscicos_blocks_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la  $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la  $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+
+if USE_EMBEDDED_BLAS
+libsciscicos_blocks_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
+endif
+
 #### scicos_blocks : Conf files ####
 libsciscicos_blocks_la_rootdir = $(mydatadir)
 libsciscicos_blocks_la_root_DATA = changelog.txt license.txt readme.txt version.xml
index 07c3b0e..2327940 100644 (file)
@@ -53,6 +53,7 @@ DIST_COMMON = $(am__libsciscicos_blocks_la_include_HEADERS_DIST) \
 @GUI_TRUE@am__append_1 = java
 @SWIG_TRUE@am__append_2 = swig
 @GIWS_TRUE@am__append_3 = giws
+@SCICOS_TRUE@@USE_EMBEDDED_BLAS_TRUE@am__append_4 = $(top_builddir)/libs/blas/libsciblas.la
 subdir = modules/scicos_blocks
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -86,7 +87,6 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 @SCICOS_TRUE@libsciscicos_blocks_la_DEPENDENCIES =  \
 @SCICOS_TRUE@  $(top_builddir)/modules/core/libscicore.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/cacsd/libscicacsd.la \
-@SCICOS_TRUE@  $(top_builddir)/libs/blas/libsciblas.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/graphics/libscigraphics.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/renderer/libscirenderer.la \
@@ -97,7 +97,8 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 @SCICOS_TRUE@  $(top_builddir)/modules/string/libscistring.la \
 @SCICOS_TRUE@  $(top_builddir)/libs/MALLOC/libscimalloc.la \
 @SCICOS_TRUE@  $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-@SCICOS_TRUE@  $(top_builddir)/libs/lapack/libscilapack.la
+@SCICOS_TRUE@  $(top_builddir)/libs/lapack/libscilapack.la \
+@SCICOS_TRUE@  $(am__append_4)
 am__libsciscicos_blocks_la_SOURCES_DIST = src/c/absolute_value.c \
        src/c/acos_blk.c src/c/acosh_blk.c src/c/asin_blk.c \
        src/c/asinh_blk.c src/c/atan_blk.c src/c/atanh_blk.c \
@@ -1208,7 +1209,22 @@ JARMASK = *.jar
 @SCICOS_TRUE@CLEANFILES = $(top_srcdir)/modules/scicos_blocks/includes/blocks.h $(top_srcdir)/modules/scicos_blocks/build/Cblocknames $(top_srcdir)/modules/scicos_blocks/build/Fblocknames
 
 # cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la
-@SCICOS_TRUE@libsciscicos_blocks_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la  $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+@SCICOS_TRUE@libsciscicos_blocks_la_LIBADD =  \
+@SCICOS_TRUE@  $(top_builddir)/modules/core/libscicore.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/cacsd/libscicacsd.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/graphics/libscigraphics.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/renderer/libscirenderer.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/polynomials/libscipolynomials.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/fileio/libscifileio.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/string/libscistring.la \
+@SCICOS_TRUE@  $(top_builddir)/libs/MALLOC/libscimalloc.la \
+@SCICOS_TRUE@  $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+@SCICOS_TRUE@  $(top_builddir)/libs/lapack/libscilapack.la \
+@SCICOS_TRUE@  $(am__append_4)
+
 #### scicos_blocks : Conf files ####
 @SCICOS_TRUE@libsciscicos_blocks_la_rootdir = $(mydatadir)
 @SCICOS_TRUE@libsciscicos_blocks_la_root_DATA = changelog.txt license.txt readme.txt version.xml
index eb4d214..2eefce7 100644 (file)
@@ -100,9 +100,11 @@ pkglib_LTLIBRARIES = libscisignal_processing.la
 
 libscisignal_processing_la_SOURCES = $(SIGNAL_PROCESSING_FORTRAN_SOURCES) $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 
-libscisignal_processing_la_LIBADD =  $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
-
+libscisignal_processing_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 
+if USE_EMBEDDED_BLAS
+libscisignal_processing_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la 
+endif
 
 #### Target ######
 modulename=signal_processing
index 81f3e83..5ebb55d 100644 (file)
@@ -47,12 +47,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la 
 DIST_COMMON = $(libscisignal_processing_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/signal_processing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -85,14 +86,12 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscisignal_processing_la_includedir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libscisignal_processing_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/blas/libsciblas.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+libscisignal_processing_la_DEPENDENCIES = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/lapack/libscilapack.la
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 am__objects_1 = sci_ffir.lo degree.lo parcha.lo ouch.lo dfftbi.lo \
        dsqrtc.lo tranze.lo chebc.lo tscccf.lo dsn2.lo hammin.lo \
        bounn.lo nstabl.lo ino.lo desia.lo desi11.lo cmpse3.lo \
@@ -426,7 +425,12 @@ libscisignal_processing_la_CFLAGS = -Iincludes/ \
 
 pkglib_LTLIBRARIES = libscisignal_processing.la
 libscisignal_processing_la_SOURCES = $(SIGNAL_PROCESSING_FORTRAN_SOURCES) $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscisignal_processing_la_LIBADD = $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscisignal_processing_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 
 #### Target ######
 modulename = signal_processing
@@ -470,7 +474,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index cf35955..65e5cda 100644 (file)
@@ -168,9 +168,11 @@ pkglib_LTLIBRARIES = libscisparse.la
 
 libscisparse_la_SOURCES = $(SPARSE_C_SOURCES) $(SPARSE_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 
-libscisparse_la_LIBADD =  $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
-
+libscisparse_la_LIBADD =  $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/core/libscicore.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 
+if USE_EMBEDDED_BLAS
+libscisparse_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
+endif
 
 #### Target ######
 modulename=sparse
index 05ecade..893ed85 100644 (file)
@@ -47,11 +47,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
 DIST_COMMON = $(libscisparse_la_include_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/sparse
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -85,14 +86,13 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscisparse_la_DEPENDENCIES = $(top_builddir)/modules/io/libsciio.la \
        $(top_builddir)/modules/core/libscicore.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/polynomials/libscipolynomials.la \
        $(top_builddir)/modules/string/libscistring.la \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/lapack/libscilapack.la
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 am__objects_1 = libscisparse_la-spUtils.lo libscisparse_la-mspelm.lo \
        libscisparse_la-lu.lo libscisparse_la-spFactor.lo \
        libscisparse_la-spBuild.lo libscisparse_la-spOutput.lo \
@@ -507,7 +507,15 @@ libscisparse_la_CFLAGS = -Iincludes/ \
 #-Isrc/c/
 pkglib_LTLIBRARIES = libscisparse.la
 libscisparse_la_SOURCES = $(SPARSE_C_SOURCES) $(SPARSE_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscisparse_la_LIBADD = $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libscisparse_la_LIBADD = $(top_builddir)/modules/io/libsciio.la \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/polynomials/libscipolynomials.la \
+       $(top_builddir)/modules/string/libscistring.la \
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 
 #### Target ######
 modulename = sparse
@@ -542,7 +550,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index d304183..261ca85 100644 (file)
@@ -43,9 +43,11 @@ libscispecial_functions_la_CFLAGS=   -Iincludes/ \
 pkglib_LTLIBRARIES = libscispecial_functions.la
 
 libscispecial_functions_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscispecial_functions_la_LIBADD =  $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/statistics/libscistatistics.la
-
+libscispecial_functions_la_LIBADD =   $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/statistics/libscistatistics.la
 
+if USE_EMBEDDED_BLAS
+libscispecial_functions_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
+endif
 
 #### Target ######
 modulename=special_functions
index dad480b..7ed160e 100644 (file)
@@ -47,12 +47,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
 DIST_COMMON = $(libscispecial_functions_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/special_functions
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -85,11 +86,11 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscispecial_functions_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(top_builddir)/modules/statistics/libscistatistics.la
+       $(top_builddir)/modules/statistics/libscistatistics.la \
+       $(am__append_1)
 am__objects_1 = libscispecial_functions_la-sci_dlgamma.lo \
        libscispecial_functions_la-sci_oldbessely.lo \
        libscispecial_functions_la-sci_bessely.lo \
@@ -359,7 +360,12 @@ libscispecial_functions_la_CFLAGS = -Iincludes/ \
 
 pkglib_LTLIBRARIES = libscispecial_functions.la
 libscispecial_functions_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscispecial_functions_la_LIBADD = $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/statistics/libscistatistics.la
+libscispecial_functions_la_LIBADD =  \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+       $(top_builddir)/modules/statistics/libscistatistics.la \
+       $(am__append_1)
 
 #### Target ######
 modulename = special_functions
@@ -384,7 +390,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro
index f2ce9ef..a8efb35 100644 (file)
@@ -33,7 +33,12 @@ libsciumfpack_la_sci_gateway_DATA = sci_gateway/umfpack_gateway.xml
 libsciumfpack_la_SOURCES = $(UMFPACK_C_SOURCES) 
 #$(GATEWAY_C_SOURCES)
 
-libsciumfpack_la_LIBADD =  $(top_builddir)/modules/libmx/libmx.la $(top_builddir)/modules/libmat/libmat.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/libmex/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libsciumfpack_la_LIBADD =  $(top_builddir)/modules/libmx/libmx.la $(top_builddir)/modules/libmat/libmat.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/libmex/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+
+if USE_EMBEDDED_BLAS
+libsciumfpack_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la 
+endif
+
 libsciumfpack_la_CFLAGS=       -Iincludes/ \
                        -Isrc/c/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
index eb9fabe..e28feb7 100644 (file)
@@ -48,12 +48,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la 
 DIST_COMMON = $(libsciumfpack_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_1 = java
-@SWIG_TRUE@am__append_2 = swig
-@GIWS_TRUE@am__append_3 = giws
+@GUI_TRUE@am__append_2 = java
+@SWIG_TRUE@am__append_3 = swig
+@GIWS_TRUE@am__append_4 = giws
 subdir = modules/umfpack
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -88,12 +89,11 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciumfpack_la_DEPENDENCIES =  \
        $(top_builddir)/modules/libmx/libmx.la \
        $(top_builddir)/modules/libmat/libmat.la \
-       $(top_builddir)/libs/blas/libsciblas.la \
        $(top_builddir)/modules/sparse/libscisparse.la \
        $(top_builddir)/modules/libmex/libmex.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/lapack/libscilapack.la
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 am__objects_1 = libsciumfpack_la-intscispt.lo \
        libsciumfpack_la-taucs_scilab.lo
 am_libsciumfpack_la_OBJECTS = $(am__objects_1)
@@ -326,7 +326,13 @@ libsciumfpack_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciumfpack_la_sci_gateway_DATA = sci_gateway/umfpack_gateway.xml
 libsciumfpack_la_SOURCES = $(UMFPACK_C_SOURCES) 
 #$(GATEWAY_C_SOURCES)
-libsciumfpack_la_LIBADD = $(top_builddir)/modules/libmx/libmx.la $(top_builddir)/modules/libmat/libmat.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/libmex/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
+libsciumfpack_la_LIBADD = $(top_builddir)/modules/libmx/libmx.la \
+       $(top_builddir)/modules/libmat/libmat.la \
+       $(top_builddir)/modules/sparse/libscisparse.la \
+       $(top_builddir)/modules/libmex/libmex.la \
+       $(top_builddir)/modules/core/libscicore.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/libs/lapack/libscilapack.la $(am__append_1)
 libsciumfpack_la_CFLAGS = -Iincludes/ \
                        -Isrc/c/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
@@ -347,7 +353,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
+TARGETS_ALL = $(am__append_2) $(am__append_3) $(am__append_4)
 
 ################ MACROS ######################"
 # Rule to build a macro