* Under GNU/Linux and Mac OS X, for each module, get ride of the list of 28/5028/3
Sylvestre Ledru [Tue, 27 Sep 2011 09:32:16 +0000 (11:32 +0200)]
  the explicit dependencies on the other libraries. Use libscilab-cli.so or
  libscilab.so to link against Scilab.

Change-Id: I569e00d0ed3f80b28e6e725bf2bfa48a024441de

115 files changed:
scilab/CHANGES_5.4.X
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/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/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/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/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/sound/Makefile.am
scilab/modules/sound/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/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in

index b1d6e8d..a9b4f85 100644 (file)
@@ -345,6 +345,10 @@ Compilation:
   as a static library (only available in the source tree).
   This will avoid an important dependency tree for unitary testing.
 
+* Under GNU/Linux and Mac OS X, for each module, get ride of the list of 
+  the explicit dependencies on the other libraries. Use libscilab-cli.so or
+  libscilab.so to link against Scilab.
+
 * Force the Java class version target to version 6 (or 1.6).
 
 * Add Java 7 in the Debian & Ubuntu search path under GNU/Linux.
index 3ed4036..0f44fe1 100644 (file)
@@ -191,7 +191,10 @@ ENGINE_LIBS =      $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/functions/libscifunctions.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
-       $(top_builddir)/modules/xml/libscixml.la
+       $(top_builddir)/modules/xml/libscixml.la \
+        $(top_builddir)/modules/statistics/libscistatistics.la \
+        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+       $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
 
 # These libraries are loaded dynamically from Scilab.
 ENGINE_LIBS_DYNAMIC_LOAD = \
@@ -200,12 +203,10 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
        $(top_builddir)/modules/interpolation/libsciinterpolation.la \
        $(top_builddir)/modules/symbolic/libscisymbolic.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/statistics/libscistatistics.la \
        $(top_builddir)/modules/randlib/libscirandlib.la \
        $(top_builddir)/modules/xcos/libscixcos.la \
        $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
        $(top_builddir)/modules/scicos/libsciscicos.la \
-       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/sound/libscisound.la \
        $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
        $(top_builddir)/modules/umfpack/libsciumfpack.la \
index e34962a..6245223 100644 (file)
@@ -530,7 +530,10 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/functions/libscifunctions.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
-       $(top_builddir)/modules/xml/libscixml.la
+       $(top_builddir)/modules/xml/libscixml.la \
+        $(top_builddir)/modules/statistics/libscistatistics.la \
+        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+       $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
 
 
 # These libraries are loaded dynamically from Scilab.
@@ -540,12 +543,10 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
        $(top_builddir)/modules/interpolation/libsciinterpolation.la \
        $(top_builddir)/modules/symbolic/libscisymbolic.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/statistics/libscistatistics.la \
        $(top_builddir)/modules/randlib/libscirandlib.la \
        $(top_builddir)/modules/xcos/libscixcos.la \
        $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
        $(top_builddir)/modules/scicos/libsciscicos.la \
-       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/sound/libscisound.la \
        $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
        $(top_builddir)/modules/umfpack/libsciumfpack.la \
index 243ea10..3fb836d 100644 (file)
@@ -88,12 +88,7 @@ CHECK_SRC= $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
 
 ## Libraries necessary
-## Change to include other Scilab modules/lib
-libsciaction_binding_la_LIBADD = libsciaction_binding-algo.la  $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                                                                       $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
-# Cyclic dependancy
-#                                                                      $(top_builddir)/modules/jvm/libscijvm.la
+libsciaction_binding_la_LIBADD = libsciaction_binding-algo.la
 
 #### Name of the module and the path ######
 modulename=action_binding
index 1c178b0..f59317c 100644 (file)
@@ -137,9 +137,7 @@ libsciaction_binding_disable_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-libsciaction_binding_la_DEPENDENCIES = libsciaction_binding-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciaction_binding_la_DEPENDENCIES = libsciaction_binding-algo.la
 am__libsciaction_binding_la_SOURCES_DIST =  \
        sci_gateway/c/gw_action_binding.c \
        sci_gateway/cpp/sci_notify.cpp
@@ -499,12 +497,7 @@ libsciaction_binding_algo_la_CPPFLAGS = $(libsciaction_binding_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
-libsciaction_binding_la_LIBADD = libsciaction_binding-algo.la  $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                                                                       $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
-
-# Cyclic dependancy
-#                                                                      $(top_builddir)/modules/jvm/libscijvm.la
+libsciaction_binding_la_LIBADD = libsciaction_binding-algo.la
 
 #### Name of the module and the path ######
 modulename = action_binding
index d288001..fe87048 100644 (file)
@@ -38,9 +38,7 @@ libsciboolean_algo_la_CFLAGS = $(libsciboolean_la_CFLAGS)
 CHECK_SRC= $(BOOLEAN_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciboolean_la_CFLAGS)
 
-libsciboolean_la_LIBADD = libsciboolean-algo.la \
-       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+libsciboolean_la_LIBADD = libsciboolean-algo.la
 
 modulename=boolean
 
index 869dd3f..bec67c5 100644 (file)
@@ -115,9 +115,7 @@ am__objects_1 = libsciboolean_algo_la-matboolean.lo \
 am__objects_2 = logic.lo find.lo
 am_libsciboolean_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libsciboolean_algo_la_OBJECTS = $(am_libsciboolean_algo_la_OBJECTS)
-libsciboolean_la_DEPENDENCIES = libsciboolean-algo.la \
-       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+libsciboolean_la_DEPENDENCIES = libsciboolean-algo.la
 am__objects_3 = libsciboolean_la-sci_and.lo libsciboolean_la-sci_or.lo \
        libsciboolean_la-sci_find.lo libsciboolean_la-sci_bool2s.lo \
        libsciboolean_la-gw_boolean.lo
@@ -434,10 +432,7 @@ libsciboolean_algo_la_CFLAGS = $(libsciboolean_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(BOOLEAN_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciboolean_la_CFLAGS)
-libsciboolean_la_LIBADD = libsciboolean-algo.la \
-       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
-
+libsciboolean_la_LIBADD = libsciboolean-algo.la
 modulename = boolean
 
 #### boolean : Conf files ####
index ce9c9b0..14bd1d6 100644 (file)
@@ -221,8 +221,7 @@ CHECK_SRC= $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS)
 
 
-# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
-libscicacsd_la_LIBADD = libscicacsd-algo.la $(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/output_stream/libscioutput_stream.la 
+libscicacsd_la_LIBADD = libscicacsd-algo.la 
 
 
 #### Target ######
index bbdaedb..87f40a9 100644 (file)
@@ -135,15 +135,7 @@ am__objects_2 = sb04pd.lo ib01ad.lo tb01wd.lo ib01py.lo mb01rx.lo \
        polmc.lo ssxmc.lo ZB03OD.lo riccpack.lo Ex-schur.lo
 am_libscicacsd_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscicacsd_algo_la_OBJECTS = $(am_libscicacsd_algo_la_OBJECTS)
-libscicacsd_la_DEPENDENCIES = libscicacsd-algo.la \
-       $(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/output_stream/libscioutput_stream.la
+libscicacsd_la_DEPENDENCIES = libscicacsd-algo.la
 am__objects_3 = libscicacsd_la-sci_f_hinf.lo \
        libscicacsd_la-sci_f_zrankqr.lo libscicacsd_la-sci_f_tzer.lo \
        libscicacsd_la-sci_f_residu.lo libscicacsd_la-sci_f_sylv.lo \
@@ -658,9 +650,7 @@ libscicacsd_algo_la_CFLAGS = $(libscicacsd_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS)
-
-# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
-libscicacsd_la_LIBADD = libscicacsd-algo.la $(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/output_stream/libscioutput_stream.la 
+libscicacsd_la_LIBADD = libscicacsd-algo.la 
 
 #### Target ######
 modulename = cacsd
index b18f5b7..ad108ff 100644 (file)
@@ -57,10 +57,6 @@ if SWIG
 BUILT_SOURCES=swig
 endif
 
-libscicommons_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la \
-$(top_builddir)/modules/fileio/libscifileio.la
-
 
 #### commons : gateway declaration ####
 libscicommons_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 829bcc3..40af964 100644 (file)
@@ -122,10 +122,7 @@ libscicommons_disable_la_OBJECTS =  \
 libscicommons_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libscicommons_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-libscicommons_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/fileio/libscifileio.la
+libscicommons_la_LIBADD =
 am__objects_1 = libscicommons_la-ScilabCommons_wrap.lo
 am__objects_2 = empty.lo
 am_libscicommons_la_OBJECTS = $(am__objects_1) $(am__objects_2)
@@ -503,10 +500,6 @@ INCLUDE_FLAGS = $(libscicommons_la_CFLAGS)
 #### SWIG Declaration ####
 SWIG_WRAPPERS = src/jni/ScilabCommons.i
 @SWIG_TRUE@BUILT_SOURCES = swig
-libscicommons_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la \
-$(top_builddir)/modules/fileio/libscifileio.la
-
 
 #### commons : gateway declaration ####
 libscicommons_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 4558969..4b2a8c9 100644 (file)
@@ -59,9 +59,8 @@ CHECK_SRC= $(COMPLETION_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscicompletion_la_CFLAGS)
 
 ## Libraries necessary
-## Change to include other Scilab modules/lib
-libscicompletion_la_LIBADD = libscicompletion-algo.la $(top_builddir)/modules/fileio/libscifileio.la  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
-#$(top_builddir)/modules/graphics/libscigraphics.la
+libscicompletion_la_LIBADD = libscicompletion-algo.la 
+
 #### Name of the module and the path ######
 modulename=completion
 
index 5490c89..de77ae5 100644 (file)
@@ -144,10 +144,7 @@ libscicompletion_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscicompletion_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libscicompletion_la_DEPENDENCIES = libscicompletion-algo.la \
-       $(top_builddir)/modules/fileio/libscifileio.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscicompletion_la_DEPENDENCIES = libscicompletion-algo.la
 am__objects_3 = libscicompletion_la-sci_completion.lo \
        libscicompletion_la-gw_completion.lo
 am_libscicompletion_la_OBJECTS = $(am__objects_3)
@@ -479,8 +476,8 @@ libscicompletion_algo_la_CFLAGS = $(libscicompletion_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(COMPLETION_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscicompletion_la_CFLAGS)
-libscicompletion_la_LIBADD = libscicompletion-algo.la $(top_builddir)/modules/fileio/libscifileio.la  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
-#$(top_builddir)/modules/graphics/libscigraphics.la
+libscicompletion_la_LIBADD = libscicompletion-algo.la 
+
 #### Name of the module and the path ######
 modulename = completion
 
index 2b272a4..bc3b539 100644 (file)
@@ -164,12 +164,6 @@ libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSO
 CHECK_SRC= $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES)
 INCLUDE_FLAGS = $(libsciconsole_la_CFLAGS)
 
-## Libraries necessary
-## Change to include other Scilab modules/lib
-libsciconsole_la_LIBADD =  $(top_builddir)/modules/fileio/libscifileio.la \
-                       $(top_builddir)/libs/MALLOC/libscimalloc.la 
-# java code is needed $(top_builddir)/modules/jvm/libscijvm.la
-
 #### console : gateway declaration ####
 libsciconsole_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libsciconsole_la_sci_gateway_DATA = sci_gateway/console_gateway.xml
index b8d750e..ccc3334 100644 (file)
@@ -160,9 +160,7 @@ libsciconsole_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libsciconsole_la_DEPENDENCIES =  \
-       $(top_builddir)/modules/fileio/libscifileio.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la
+libsciconsole_la_LIBADD =
 am__libsciconsole_la_SOURCES_DIST = src/jni/GuiManagement_wrap.c \
        src/jni/DropFiles_wrap.c src/c/InitializeConsole.c \
        src/c/GuiManagement.c src/c/dropFiles.c src/c/clc.c \
@@ -597,10 +595,6 @@ libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSO
 # For the code check (splint)
 CHECK_SRC = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES)
 INCLUDE_FLAGS = $(libsciconsole_la_CFLAGS)
-libsciconsole_la_LIBADD = $(top_builddir)/modules/fileio/libscifileio.la \
-                       $(top_builddir)/libs/MALLOC/libscimalloc.la 
-
-# java code is needed $(top_builddir)/modules/jvm/libscijvm.la
 
 #### console : gateway declaration ####
 libsciconsole_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index b3cb215..1879b52 100644 (file)
@@ -323,7 +323,6 @@ libscicore_algo_la_CPPFLAGS = $(libscicore_la_CPPFLAGS)
 
 # Commented because it is easier to comment first the core module
 libscicore_la_LIBADD = libscicore-algo.la
-# $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/fftw/libscifftw.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/special_functions/libscispecial_functions.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/data_structures/libscidata_structures.la $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/randlib/libscirandlib.la $(top_builddir)/modules/localization/libscilocalization.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/signal_processing/libscisignal_processing.la $(top_builddir)/modules/completion/libscicompletion.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/double/libscidouble.la $(top_builddir)/modules/sound/libscisound.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/graphic_export/libscigraphic_export.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/spreadsheet/libscispreadsheet.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/metanet/libscimetanet.la $(top_builddir)/modules/windows_tools/libsciwindows_tools.la $(top_builddir)/modules/interpolation/libsciinterpolation.la $(top_builddir)/modules/symbolic/libscisymbolic.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/statistics/libscistatistics.la $(top_builddir)/modules/jvm/libscijvm.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/optimization/libscioptimization.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 
 #### Target ######
 modulename=core
index a325714..189a6d3 100644 (file)
@@ -799,7 +799,6 @@ libscicore_algo_la_CPPFLAGS = $(libscicore_la_CPPFLAGS)
 
 # Commented because it is easier to comment first the core module
 libscicore_la_LIBADD = libscicore-algo.la
-# $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/fftw/libscifftw.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/special_functions/libscispecial_functions.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/data_structures/libscidata_structures.la $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/randlib/libscirandlib.la $(top_builddir)/modules/localization/libscilocalization.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/signal_processing/libscisignal_processing.la $(top_builddir)/modules/completion/libscicompletion.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/double/libscidouble.la $(top_builddir)/modules/sound/libscisound.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/graphic_export/libscigraphic_export.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/spreadsheet/libscispreadsheet.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/metanet/libscimetanet.la $(top_builddir)/modules/windows_tools/libsciwindows_tools.la $(top_builddir)/modules/interpolation/libsciinterpolation.la $(top_builddir)/modules/symbolic/libscisymbolic.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/statistics/libscistatistics.la $(top_builddir)/modules/jvm/libscijvm.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/optimization/libscioptimization.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
 
 #### Target ######
 modulename = core
index 7005e07..5700a87 100644 (file)
@@ -65,8 +65,7 @@ libscidata_structures_algo_la_CFLAGS = $(libscidata_structures_la_CFLAGS)
 CHECK_SRC= $(DATA_STRUCTURES_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscidata_structures_la_CFLAGS)
 
-# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la 
-libscidata_structures_la_LIBADD = libscidata_structures-algo.la libdummy-data_structures.la  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscidata_structures_la_LIBADD = libscidata_structures-algo.la libdummy-data_structures.la
 
 
 libdummy_data_structures_la-intl_e.lo: src/fortran/intl_e.f
index bc184a2..e864e44 100644 (file)
@@ -129,12 +129,7 @@ am_libscidata_structures_algo_la_OBJECTS = $(am__objects_1) \
 libscidata_structures_algo_la_OBJECTS =  \
        $(am_libscidata_structures_algo_la_OBJECTS)
 libscidata_structures_la_DEPENDENCIES = libscidata_structures-algo.la \
-       libdummy-data_structures.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/integer/libsciinteger.la \
-       $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+       libdummy-data_structures.la
 am__objects_3 = libscidata_structures_la-sci_lsslist.lo \
        libscidata_structures_la-sci_glist.lo \
        libscidata_structures_la-sci_mlist.lo \
@@ -497,9 +492,7 @@ libscidata_structures_algo_la_CFLAGS = $(libscidata_structures_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(DATA_STRUCTURES_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscidata_structures_la_CFLAGS)
-
-# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la 
-libscidata_structures_la_LIBADD = libscidata_structures-algo.la libdummy-data_structures.la  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscidata_structures_la_LIBADD = libscidata_structures-algo.la libdummy-data_structures.la
 
 #### Target ######
 modulename = data_structures
index 73437e4..ac9ddc3 100644 (file)
@@ -146,7 +146,7 @@ libscidifferential_equations_algo_la_CFLAGS = $(libscidifferential_equations_la_
 CHECK_SRC= $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscidifferential_equations_la_CFLAGS)
 
-libscidifferential_equations_la_LIBADD = libscidifferential_equations-algo.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 
+libscidifferential_equations_la_LIBADD = libscidifferential_equations-algo.la
 
 
 #### Target ######
index b9b97af..c10ab5f 100644 (file)
@@ -137,12 +137,7 @@ am_libscidifferential_equations_algo_la_OBJECTS = $(am__objects_1) \
 libscidifferential_equations_algo_la_OBJECTS =  \
        $(am_libscidifferential_equations_algo_la_OBJECTS)
 libscidifferential_equations_la_DEPENDENCIES =  \
-       libscidifferential_equations-algo.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
+       libscidifferential_equations-algo.la
 am__objects_3 = libscidifferential_equations_la-sci_int2d.lo \
        libscidifferential_equations_la-sci_int3d.lo \
        libscidifferential_equations_la-sci_intg.lo \
@@ -586,7 +581,7 @@ libscidifferential_equations_algo_la_CFLAGS = $(libscidifferential_equations_la_
 # For the code check (splint)
 CHECK_SRC = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscidifferential_equations_la_CFLAGS)
-libscidifferential_equations_la_LIBADD = libscidifferential_equations-algo.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 
+libscidifferential_equations_la_LIBADD = libscidifferential_equations-algo.la
 
 #### Target ######
 modulename = differential_equations
index c7f97a0..e014f8a 100644 (file)
@@ -40,7 +40,6 @@ libscidouble_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 CHECK_SRC= $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscidouble_la_CFLAGS)
 
-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/output_stream/libscioutput_stream.la 
 
 
 #### Target ######
index f00fca4..a80a362 100644 (file)
@@ -107,13 +107,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscidouble_la_etcdir)" \
        "$(DESTDIR)$(libscidouble_la_rootdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libscidouble_la_DEPENDENCIES =  \
-       $(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/output_stream/libscioutput_stream.la
+libscidouble_la_LIBADD =
 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 \
@@ -431,7 +425,6 @@ libscidouble_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 # For the code check (splint)
 CHECK_SRC = $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscidouble_la_CFLAGS)
-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/output_stream/libscioutput_stream.la 
 
 #### Target ######
 modulename = double
index b64634c..8b2ac03 100644 (file)
@@ -48,7 +48,8 @@ CHECK_SRC=  $(DYNAMIC_LINK_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscidynamic_link_la_CFLAGS)
 
 # cyclic  
-libscidynamic_link_la_LIBADD = libscidynamic_link-algo.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscidynamic_link_la_LIBADD = libscidynamic_link-algo.la
+
 #### Target ######
 modulename=dynamic_link
 
index 3ca1b78..3221bd3 100644 (file)
@@ -124,13 +124,7 @@ libscidynamic_link_algo_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscidynamic_link_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libscidynamic_link_la_DEPENDENCIES = libscidynamic_link-algo.la \
-       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
-       $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscidynamic_link_la_DEPENDENCIES = libscidynamic_link-algo.la
 am__objects_2 = libscidynamic_link_la-gw_dynamic_link.lo \
        libscidynamic_link_la-sci_getdynlibext.lo \
        libscidynamic_link_la-sci_addinter.lo \
@@ -465,7 +459,8 @@ CHECK_SRC = $(DYNAMIC_LINK_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscidynamic_link_la_CFLAGS)
 
 # cyclic  
-libscidynamic_link_la_LIBADD = libscidynamic_link-algo.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscidynamic_link_la_LIBADD = libscidynamic_link-algo.la
+
 #### Target ######
 modulename = dynamic_link
 
index 0ce819f..4f499a0 100644 (file)
@@ -409,9 +409,6 @@ INCLUDE_FLAGS = $(libscielementary_functions_la_CFLAGS)
 
 libscielementary_functions_la_LIBADD = libdummy-elementary_functions.la libscielementary_functions-algo.la
 
-# Commented because it is one of the first module to be compiled
-#libdummy-elementary_functions.la   $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/sparse/libscisparse.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)/modules/integer/libsciinteger.la  $(top_builddir)/modules/cacsd/libscicacsd.la
-
 libdummy_elementary_functions_la-hqror2.lo: src/fortran/eispack/hqror2.f
        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(libdummy_elementary_functions_la_FFLAGS) -c -o libdummy_elementary_functions_la-hqror2.lo `test -f 'src/fortran/eispack/hqror2.f' || echo '$(srcdir)/'`src/fortran/eispack/hqror2.f
 
index 501907d..4c41a2a 100644 (file)
@@ -2840,9 +2840,6 @@ uninstall-am: uninstall-libscielementary_functions_la_etcDATA \
        uninstall-pkglibLTLIBRARIES
 
 
-# Commented because it is one of the first module to be compiled
-#libdummy-elementary_functions.la   $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/sparse/libscisparse.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)/modules/integer/libsciinteger.la  $(top_builddir)/modules/cacsd/libscicacsd.la
-
 libdummy_elementary_functions_la-hqror2.lo: src/fortran/eispack/hqror2.f
        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(libdummy_elementary_functions_la_FFLAGS) -c -o libdummy_elementary_functions_la-hqror2.lo `test -f 'src/fortran/eispack/hqror2.f' || echo '$(srcdir)/'`src/fortran/eispack/hqror2.f
 
index 1c7e4c5..61b405e 100644 (file)
@@ -58,7 +58,8 @@ libscifftw_algo_la_CFLAGS = $(libscifftw_la_CFLAGS)
 CHECK_SRC= $(FFTW_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscifftw_la_CFLAGS)
 
-libscifftw_la_LIBADD = libscifftw-algo.la $(top_builddir)/libs/MALLOC/libscimalloc.la  $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+libscifftw_la_LIBADD = libscifftw-algo.la
+
 libscifftw_la_CFLAGS=          -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
index 02a0d05..76739a7 100644 (file)
@@ -129,11 +129,7 @@ libscifftw_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(libscifftw_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
 @FFTW_TRUE@am_libscifftw_algo_la_rpath =
-@FFTW_TRUE@libscifftw_la_DEPENDENCIES = libscifftw-algo.la \
-@FFTW_TRUE@    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-@FFTW_TRUE@    $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
-@FFTW_TRUE@    $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-@FFTW_TRUE@    $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+@FFTW_TRUE@libscifftw_la_DEPENDENCIES = libscifftw-algo.la
 am__libscifftw_la_SOURCES_DIST = src/nofftw/nofftw.c src/c/callfftw.c \
        src/c/fftwlibname.c src/c/fftw_utilities.c src/c/with_fftw.c \
        sci_gateway/c/gw_fftw.c \
@@ -475,7 +471,7 @@ libscifftw_la_etc_DATA = etc/fftw.quit etc/fftw.start
 # For the code check (splint)
 @FFTW_TRUE@CHECK_SRC = $(FFTW_C_SOURCES) $(GATEWAY_C_SOURCES)
 @FFTW_TRUE@INCLUDE_FLAGS = $(libscifftw_la_CFLAGS)
-@FFTW_TRUE@libscifftw_la_LIBADD = libscifftw-algo.la $(top_builddir)/libs/MALLOC/libscimalloc.la  $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+@FFTW_TRUE@libscifftw_la_LIBADD = libscifftw-algo.la
 @FFTW_FALSE@libscifftw_la_CFLAGS = -I$(srcdir)/includes/ \
 @FFTW_FALSE@                   -I$(srcdir)/src/c/ \
 @FFTW_FALSE@                   -I$(top_srcdir)/modules/api_scilab/includes \
index 8f47f79..85e970e 100644 (file)
@@ -136,12 +136,8 @@ CHECK_SRC= $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
 INCLUDE_FLAGS = $(libscifileio_la_CFLAGS)
 
 # pb of order $(top_builddir)/modules/console/libsciconsole.la
-libscifileio_la_LIBADD = libscifileio-algo.la \
-                               $(top_builddir)/modules/string/libscistring.la \
-                               $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-                               $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                               $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-                               $(top_builddir)/libs/libst/libscilibst.la
+libscifileio_la_LIBADD = libscifileio-algo.la
+
 #### Target ######
 modulename=fileio
 
index 3f3bfa3..d8c80fc 100644 (file)
@@ -161,12 +161,7 @@ libscifileio_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscifileio_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libscifileio_la_DEPENDENCIES = libscifileio-algo.la \
-       $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/libst/libscilibst.la
+libscifileio_la_DEPENDENCIES = libscifileio-algo.la
 am__objects_2 = libscifileio_la-gw_fileio.lo \
        libscifileio_la-sci_mfprintf.lo libscifileio_la-sci_mscanf.lo \
        libscifileio_la-sci_msscanf.lo libscifileio_la-sci_mfscanf.lo \
@@ -603,12 +598,7 @@ CHECK_SRC = $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
 INCLUDE_FLAGS = $(libscifileio_la_CFLAGS)
 
 # pb of order $(top_builddir)/modules/console/libsciconsole.la
-libscifileio_la_LIBADD = libscifileio-algo.la \
-                               $(top_builddir)/modules/string/libscistring.la \
-                               $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-                               $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                               $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-                               $(top_builddir)/libs/libst/libscilibst.la
+libscifileio_la_LIBADD = libscifileio-algo.la
 
 #### Target ######
 modulename = fileio
index cb52740..d6613fb 100644 (file)
@@ -50,11 +50,7 @@ CHECK_SRC= $(FUNCTIONS_SOURCES) $(GATEWAY_SOURCES)
 INCLUDE_FLAGS = $(libscifunctions_la_CFLAGS)
 
 libscifunctions_la_LIBADD =   \
-       libscifunctions-algo.la \
-$(top_builddir)/modules/string/libscistring.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la \
-$(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-$(top_builddir)/libs/MALLOC/libscimalloc.la
+       libscifunctions-algo.la
 
 #### Target ######
 modulename=functions
index d5c358a..a8b501f 100644 (file)
@@ -118,11 +118,7 @@ am__objects_2 = whereis.lo
 am_libscifunctions_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscifunctions_algo_la_OBJECTS =  \
        $(am_libscifunctions_algo_la_OBJECTS)
-libscifunctions_la_DEPENDENCIES = libscifunctions-algo.la \
-       $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la
+libscifunctions_la_DEPENDENCIES = libscifunctions-algo.la
 am__objects_3 = libscifunctions_la-gw_functions.lo \
        libscifunctions_la-sci_lib.lo libscifunctions_la-sci_deff.lo \
        libscifunctions_la-sci_execstr.lo \
@@ -456,11 +452,7 @@ libscifunctions_algo_la_CFLAGS = $(libscifunctions_la_CFLAGS)
 CHECK_SRC = $(FUNCTIONS_SOURCES) $(GATEWAY_SOURCES)
 INCLUDE_FLAGS = $(libscifunctions_la_CFLAGS)
 libscifunctions_la_LIBADD = \
-       libscifunctions-algo.la \
-$(top_builddir)/modules/string/libscistring.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la \
-$(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-$(top_builddir)/libs/MALLOC/libscimalloc.la
+       libscifunctions-algo.la
 
 
 #### Target ######
index d882c5e..7e957dd 100644 (file)
@@ -77,7 +77,7 @@ INCLUDE_FLAGS = $(libscigraphic_export_la_CPPFLAGS)
 
 ## Libraries necessary
 ## Change to include other Scilab modules/lib
-libscigraphic_export_la_LIBADD = libscigraphic_export-algo.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscigraphic_export_la_LIBADD = libscigraphic_export-algo.la
 
 GIWS_WRAPPERS= src/jni/FileExporter.giws.xml \
 src/jni/GL2PSToJOGL.giws.xml \
index 2dc1062..bfec6e7 100644 (file)
@@ -139,8 +139,7 @@ am_libscigraphic_export_disable_la_OBJECTS =  \
        libscigraphic_export_disable_la-nographic_export.lo
 libscigraphic_export_disable_la_OBJECTS =  \
        $(am_libscigraphic_export_disable_la_OBJECTS)
-libscigraphic_export_la_DEPENDENCIES = libscigraphic_export-algo.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscigraphic_export_la_DEPENDENCIES = libscigraphic_export-algo.la
 am__objects_3 = libscigraphic_export_la-gw_graphic_export.lo \
        libscigraphic_export_la-sci_xs2bmp.lo \
        libscigraphic_export_la-sci_xs2gif.lo \
@@ -505,7 +504,7 @@ libscigraphic_export_algo_la_CPPFLAGS = $(libscigraphic_export_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(GRAPHIC_EXPORT_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscigraphic_export_la_CPPFLAGS)
-libscigraphic_export_la_LIBADD = libscigraphic_export-algo.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscigraphic_export_la_LIBADD = libscigraphic_export-algo.la
 GIWS_WRAPPERS = src/jni/FileExporter.giws.xml \
 src/jni/GL2PSToJOGL.giws.xml \
 src/jni/JOGLConstant.giws.xml
index c986c7e..5163327 100644 (file)
@@ -442,7 +442,7 @@ libscigraphics_algo_la_CFLAGS = $(libscigraphics_la_CFLAGS)
 CHECK_SRC= $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscigraphics_la_CFLAGS)
 
-libscigraphics_la_LIBADD = libscigraphics-algo.la $(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)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/jvm/libscijvm.la
+libscigraphics_la_LIBADD = libscigraphics-algo.la
 
 
 
index 9f773ed..600eca1 100644 (file)
@@ -441,18 +441,7 @@ libscigraphics_disable_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscigraphics_disable_la_CFLAGS) $(CFLAGS) \
        $(libscigraphics_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-libscigraphics_la_DEPENDENCIES = libscigraphics-algo.la \
-       $(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)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/fileio/libscifileio.la \
-       $(top_builddir)/modules/jvm/libscijvm.la
+libscigraphics_la_DEPENDENCIES = libscigraphics-algo.la
 am__objects_2 = libscigraphics_la-sci_swap_handles.lo \
        libscigraphics_la-sci_grayplot.lo \
        libscigraphics_la-sci_matplot1.lo \
@@ -1213,7 +1202,7 @@ libscigraphics_algo_la_CFLAGS = $(libscigraphics_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscigraphics_la_CFLAGS)
-libscigraphics_la_LIBADD = libscigraphics-algo.la $(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)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/jvm/libscijvm.la
+libscigraphics_la_LIBADD = libscigraphics-algo.la
 
 #### graphics : gateway declaration ####
 libscigraphics_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 2ea593f..4a36a70 100644 (file)
@@ -276,8 +276,7 @@ libscigui_algo_la_CPPFLAGS = $(libscigui_la_CPPFLAGS)
 CHECK_SRC= $(GUI_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscigui_la_CFLAGS)
 
-#  cyclic $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/jvm/libscijvm.la
-libscigui_la_LIBADD = libscigui-algo.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscigui_la_LIBADD = libscigui-algo.la
 
 
 #### gui : gateway declaration ####
index c2ea7ae..c1f1a7f 100644 (file)
@@ -230,10 +230,7 @@ libscigui_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscigui_disable_la_CFLAGS) $(CFLAGS) \
        $(libscigui_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-libscigui_la_DEPENDENCIES = libscigui-algo.la \
-       $(top_builddir)/modules/renderer/libscirenderer.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscigui_la_DEPENDENCIES = libscigui-algo.la
 am__objects_4 = libscigui_la-sci_x_choice.lo libscigui_la-gw_gui.lo \
        libscigui_la-sci_x_mdialog.lo libscigui_la-sci_x_dialog.lo \
        libscigui_la-sci_x_choose.lo \
@@ -846,9 +843,7 @@ libscigui_algo_la_CPPFLAGS = $(libscigui_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(GUI_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscigui_la_CFLAGS)
-
-#  cyclic $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/jvm/libscijvm.la
-libscigui_la_LIBADD = libscigui-algo.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscigui_la_LIBADD = libscigui-algo.la
 
 #### gui : gateway declaration ####
 libscigui_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 7721741..b1cafa2 100644 (file)
@@ -121,9 +121,7 @@ CHECK_SRC= $(HDF5_SOURCES) $(GATEWAY_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscihdf5_la_CFLAGS)
 
 # pb of order
-libscihdf5_la_LIBADD = libscihdf5-algo.la \
-                               $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                               $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscihdf5_la_LIBADD = libscihdf5-algo.la
 
 #### Target ######
 modulename=hdf5
index f2ae410..f0f1e2f 100644 (file)
@@ -154,9 +154,7 @@ libscihdf5_forceload_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $@
 @HDF5_TRUE@@NEED_JAVA_TRUE@am_libscihdf5_forceload_la_rpath = -rpath \
 @HDF5_TRUE@@NEED_JAVA_TRUE@    $(pkglibdir)
-libscihdf5_la_DEPENDENCIES = libscihdf5-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscihdf5_la_DEPENDENCIES = libscihdf5-algo.la
 am__libscihdf5_la_SOURCES_DIST = sci_gateway/cpp/sci_no_hdf5.cpp \
        sci_gateway/cpp/sci_export_to_hdf5.cpp \
        sci_gateway/cpp/sci_import_from_hdf5.cpp \
@@ -530,10 +528,7 @@ CHECK_SRC = $(HDF5_SOURCES) $(GATEWAY_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscihdf5_la_CFLAGS)
 
 # pb of order
-libscihdf5_la_LIBADD = libscihdf5-algo.la \
-                               $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                               $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libscihdf5_la_LIBADD = libscihdf5-algo.la
 
 #### Target ######
 modulename = hdf5
index 81ec9a3..46fa686 100644 (file)
@@ -20,8 +20,7 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_buildDoc.cpp \
 GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml \
        src/jni/BuildDocObjectv2.giws.xml
 
-libscihelptools_la_LIBADD = libscihelptools-algo.la \
-       $(top_builddir)/modules/jvm/libscijvm.la
+libscihelptools_la_LIBADD = libscihelptools-algo.la
 
 if GIWS
 BUILT_SOURCES=giws
index 895d832..fbe8ac4 100644 (file)
@@ -126,8 +126,7 @@ am_libscihelptools_algo_la_OBJECTS = $(am__objects_1)
 libscihelptools_algo_la_OBJECTS =  \
        $(am_libscihelptools_algo_la_OBJECTS)
 @BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_la_DEPENDENCIES =  \
-@BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools-algo.la \
-@BUILD_HELP_TRUE@@GUI_TRUE@    $(top_builddir)/modules/jvm/libscijvm.la
+@BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools-algo.la
 am__libscihelptools_la_SOURCES_DIST = sci_gateway/nogui/nogui.c \
        sci_gateway/c/gw_helptools.c sci_gateway/cpp/sci_buildDoc.cpp \
        sci_gateway/cpp/sci_buildDocv2.cpp
@@ -445,9 +444,7 @@ top_srcdir = @top_srcdir@
 @BUILD_HELP_TRUE@@GUI_TRUE@GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml \
 @BUILD_HELP_TRUE@@GUI_TRUE@    src/jni/BuildDocObjectv2.giws.xml
 
-@BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_la_LIBADD = libscihelptools-algo.la \
-@BUILD_HELP_TRUE@@GUI_TRUE@    $(top_builddir)/modules/jvm/libscijvm.la
-
+@BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_la_LIBADD = libscihelptools-algo.la
 @BUILD_HELP_TRUE@@GIWS_TRUE@@GUI_TRUE@BUILT_SOURCES = giws
 pkglib_LTLIBRARIES = libscihelptools.la
 noinst_LTLIBRARIES = libscihelptools-algo.la
index d456515..2b12d90 100755 (executable)
@@ -81,10 +81,6 @@ if SWIG
 BUILT_SOURCES=swig
 endif
 
-libscihistory_browser_la_LIBADD =  \
-$(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
-
 
 #### history_browser : gateway declaration ####
 libscihistory_browser_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 0ad4f8b..b6d2764 100644 (file)
@@ -125,9 +125,7 @@ libscihistory_browser_disable_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscihistory_browser_disable_la_CFLAGS) $(CFLAGS) \
        $(libscihistory_browser_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-libscihistory_browser_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscihistory_browser_la_LIBADD =
 am__libscihistory_browser_la_SOURCES_DIST =  \
        src/nohistory_browser/CommandHistory_Wrap_Fake.c \
        src/jni/CommandHistory.cpp src/jni/GiwsException.cpp \
@@ -535,10 +533,6 @@ INCLUDE_FLAGS = $(libscihistory_browser_la_CFLAGS)
 
 #### SWIG Declaration ####
 SWIG_WRAPPERS = 
-libscihistory_browser_la_LIBADD = \
-$(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
-
 
 #### history_browser : gateway declaration ####
 libscihistory_browser_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 09ff285..caa5253 100644 (file)
@@ -86,7 +86,7 @@ CHECK_SRC= $(HISTORY_MANAGER_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscihistory_manager_la_CFLAGS)
 
 ## Libraries necessary
-libscihistory_manager_la_LIBADD = libscihistory_manager-algo.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la
+libscihistory_manager_la_LIBADD = libscihistory_manager-algo.la
 modulename=history_manager
 
 #### history_manager : Conf files ####
index e0d0f2e..0155ca7 100644 (file)
@@ -131,10 +131,7 @@ am_libscihistory_manager_algo_la_OBJECTS = $(am__objects_2) \
        $(am__objects_3)
 libscihistory_manager_algo_la_OBJECTS =  \
        $(am_libscihistory_manager_algo_la_OBJECTS)
-libscihistory_manager_la_DEPENDENCIES = libscihistory_manager-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/fileio/libscifileio.la
+libscihistory_manager_la_DEPENDENCIES = libscihistory_manager-algo.la
 am__objects_4 = libscihistory_manager_la-gw_history_manager.lo \
        libscihistory_manager_la-sci_addhistory.lo \
        libscihistory_manager_la-sci_displayhistory.lo \
@@ -510,7 +507,7 @@ libscihistory_manager_algo_la_CPPFLAGS = $(libscihistory_manager_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(HISTORY_MANAGER_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscihistory_manager_la_CFLAGS)
-libscihistory_manager_la_LIBADD = libscihistory_manager-algo.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la
+libscihistory_manager_la_LIBADD = libscihistory_manager-algo.la
 modulename = history_manager
 
 #### history_manager : Conf files ####
index f60b53e..f02e66f 100644 (file)
@@ -132,7 +132,7 @@ CHECK_SRC=  $(INTEGER_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciinteger_la_CFLAGS)
 
 # cyclic $(top_builddir)/modules/polynomials/libscipolynomials.la
-libsciinteger_la_LIBADD = libsciinteger-algo.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/libst/libscilibst.la
+libsciinteger_la_LIBADD = libsciinteger-algo.la
 
 
 
index e682a1f..4ce005c 100644 (file)
@@ -161,13 +161,7 @@ am__objects_2 = unarybit.lo i_mput.lo i_logic.lo i_a_i.lo i_b_i.lo \
        i_cumprod.lo i_cumsum.lo i_kron.lo
 am_libsciinteger_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libsciinteger_algo_la_OBJECTS = $(am_libsciinteger_algo_la_OBJECTS)
-libsciinteger_la_DEPENDENCIES = libsciinteger-algo.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/fileio/libscifileio.la \
-       $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/libs/libst/libscilibst.la
+libsciinteger_la_DEPENDENCIES = libsciinteger-algo.la
 am__objects_3 = libsciinteger_la-gw_integer.lo
 am__objects_4 = sci_i_matrix.lo sci_i_mput.lo sci_i_max.lo \
        sci_int32.lo sci_int16.lo sci_i_mini.lo sci_mgeti.lo \
@@ -583,7 +577,7 @@ CHECK_SRC = $(INTEGER_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciinteger_la_CFLAGS)
 
 # cyclic $(top_builddir)/modules/polynomials/libscipolynomials.la
-libsciinteger_la_LIBADD = libsciinteger-algo.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/libst/libscilibst.la
+libsciinteger_la_LIBADD = libsciinteger-algo.la
 
 #### Target ######
 modulename = integer
index 7d41a1e..0723658 100644 (file)
@@ -49,10 +49,7 @@ CHECK_SRC= $(INTERPOLATION_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciinterpolation_la_CFLAGS)
 
 libsciinterpolation_la_LIBADD = \
-       libsciinterpolation-algo.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-    $(top_builddir)/modules/string/libscistring.la
-
+       libsciinterpolation-algo.la
 
 #### Target ######
 modulename=interpolation
index 0a505c8..bd1b6a1 100644 (file)
@@ -120,9 +120,7 @@ am_libsciinterpolation_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2)
 libsciinterpolation_algo_la_OBJECTS =  \
        $(am_libsciinterpolation_algo_la_OBJECTS)
-libsciinterpolation_la_DEPENDENCIES = libsciinterpolation-algo.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(top_builddir)/modules/string/libscistring.la
+libsciinterpolation_la_DEPENDENCIES = libsciinterpolation-algo.la
 am__objects_3 = libsciinterpolation_la-sci_lsq_splin.lo \
        libsciinterpolation_la-sci_interp.lo \
        libsciinterpolation_la-sci_interp2d.lo \
@@ -458,9 +456,7 @@ libsciinterpolation_algo_la_CFLAGS = $(libsciinterpolation_la_CFLAGS)
 CHECK_SRC = $(INTERPOLATION_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciinterpolation_la_CFLAGS)
 libsciinterpolation_la_LIBADD = \
-       libsciinterpolation-algo.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-    $(top_builddir)/modules/string/libscistring.la
+       libsciinterpolation-algo.la
 
 
 #### Target ######
index 00cbea2..acff551 100644 (file)
@@ -42,11 +42,6 @@ libsciintersci_la_CFLAGS =   -I$(top_srcdir)/libs/MALLOC/includes/ \
 CHECK_SRC= $(libsciintersci_la_SOURCES)
 INCLUDE_FLAGS = $(libsciintersci_la_CFLAGS)
 
-libsciintersci_la_LIBADD = \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-    $(top_builddir)/modules/string/libscistring.la
-
 #### Target ######
 modulename=intersci
 
index 2accd5b..3bdf31a 100644 (file)
@@ -112,10 +112,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
        "$(DESTDIR)$(libsciintersci_la_rootdir)" \
        "$(DESTDIR)$(libsciintersci_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libsciintersci_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/string/libscistring.la
+libsciintersci_la_LIBADD =
 am__objects_1 = libsciintersci_la-libinter.lo libsciintersci_la-out.lo
 am_libsciintersci_la_OBJECTS = $(am__objects_1)
 libsciintersci_la_OBJECTS = $(am_libsciintersci_la_OBJECTS)
@@ -431,11 +428,6 @@ libsciintersci_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
 # For the code check (splint)
 CHECK_SRC = $(libsciintersci_la_SOURCES)
 INCLUDE_FLAGS = $(libsciintersci_la_CFLAGS)
-libsciintersci_la_LIBADD = \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-    $(top_builddir)/modules/string/libscistring.la
-
 
 #### Target ######
 modulename = intersci
index 5113d17..41e8d2c 100644 (file)
@@ -66,7 +66,7 @@ libsciio_algo_la_CFLAGS = $(libsciio_la_CFLAGS)
 CHECK_SRC= $(IO_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciio_la_CFLAGS)
 
-libsciio_la_LIBADD = libsciio-algo.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la  $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciio_la_LIBADD = libsciio-algo.la
 
 
 #### Target ######
index 9ea8182..7a24a59 100644 (file)
@@ -116,14 +116,7 @@ am__objects_1 = libsciio_algo_la-getpidc.lo \
 am__objects_2 = v2unit.lo newsave.lo v2cunit.lo
 am_libsciio_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libsciio_algo_la_OBJECTS = $(am_libsciio_algo_la_OBJECTS)
-libsciio_la_DEPENDENCIES = libsciio-algo.la \
-       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(top_builddir)/modules/fileio/libscifileio.la \
-       $(top_builddir)/modules/integer/libsciinteger.la \
-       $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciio_la_DEPENDENCIES = libsciio-algo.la
 am__objects_3 = libsciio_la-sci_read4b.lo libsciio_la-sci_getio.lo \
        libsciio_la-sci_readb.lo libsciio_la-sci_host.lo \
        libsciio_la-sci_file.lo libsciio_la-sci_getenv.lo \
@@ -472,7 +465,7 @@ libsciio_algo_la_CFLAGS = $(libsciio_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(IO_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciio_la_CFLAGS)
-libsciio_la_LIBADD = libsciio-algo.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la  $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciio_la_LIBADD = libsciio-algo.la
 
 #### Target ######
 modulename = io
index d8e4567..595c6e1 100644 (file)
@@ -52,7 +52,7 @@ if IS_MACOSX
 libscijvm_la_LDFLAGS += -framework JavaVM
 endif
 
-libscijvm_la_LIBADD =  libscijvm-algo.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscijvm_la_LIBADD =  libscijvm-algo.la
 
 #### jvm : gateway declaration ####
 libscijvm_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 3c688c6..d261d5a 100644 (file)
@@ -152,11 +152,7 @@ libscijvm_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscijvm_disable_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libscijvm_la_DEPENDENCIES = libscijvm-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/fileio/libscifileio.la \
-       $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscijvm_la_DEPENDENCIES = libscijvm-algo.la
 am__objects_2 = libscijvm_la-sci_system_getproperty.lo \
        libscijvm_la-sci_system_setproperty.lo \
        libscijvm_la-sci_with_embedded_jre.lo \
@@ -468,7 +464,7 @@ pkglib_LTLIBRARIES = libscijvm-disable.la $(am__append_1)
 @GUI_TRUE@noinst_LTLIBRARIES = libscijvm-algo.la
 libscijvm_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) \
        -lpthread $(XML_LIBS) $(am__append_2)
-libscijvm_la_LIBADD = libscijvm-algo.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscijvm_la_LIBADD = libscijvm-algo.la
 
 #### jvm : gateway declaration ####
 libscijvm_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 3660ba1..9f67d61 100644 (file)
@@ -108,7 +108,7 @@ libscilinear_algebra_algo_la_CFLAGS = $(libscilinear_algebra_la_CFLAGS)
 CHECK_SRC= $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscilinear_algebra_la_CFLAGS)
 
-libscilinear_algebra_la_LIBADD = libscilinear_algebra-algo.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/output_stream/libscioutput_stream.la 
+libscilinear_algebra_la_LIBADD = libscilinear_algebra-algo.la
 
 #### Target ######
 modulename=linear_algebra
index 228e35f..a19e473 100644 (file)
@@ -128,11 +128,7 @@ am_libscilinear_algebra_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2)
 libscilinear_algebra_algo_la_OBJECTS =  \
        $(am_libscilinear_algebra_algo_la_OBJECTS)
-libscilinear_algebra_la_DEPENDENCIES = libscilinear_algebra-algo.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/output_stream/libscioutput_stream.la
+libscilinear_algebra_la_DEPENDENCIES = libscilinear_algebra-algo.la
 am__objects_3 = libscilinear_algebra_la-sci_backslash.lo \
        libscilinear_algebra_la-sci_hess.lo \
        libscilinear_algebra_la-sci_rcond.lo \
@@ -542,7 +538,7 @@ libscilinear_algebra_algo_la_CFLAGS = $(libscilinear_algebra_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscilinear_algebra_la_CFLAGS)
-libscilinear_algebra_la_LIBADD = libscilinear_algebra-algo.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/output_stream/libscioutput_stream.la 
+libscilinear_algebra_la_LIBADD = libscilinear_algebra-algo.la
 
 #### Target ######
 modulename = linear_algebra
index 6c99d41..05c115f 100644 (file)
@@ -59,7 +59,7 @@ libscilocalization_algo_la_CFLAGS = $(libscilocalization_la_CFLAGS)
 CHECK_SRC= $(libscilocalization_la_SOURCES)
 INCLUDE_FLAGS = $(libscilocalization_la_CFLAGS)
 
-libscilocalization_la_LIBADD = libscilocalization-algo.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/api_scilab/libsciapi_scilab.la
+libscilocalization_la_LIBADD = libscilocalization-algo.la
 
 # $(top_builddir)/modules/io/libsciio.la
 #### Target ######
index 19294ee..1275661 100644 (file)
@@ -143,10 +143,7 @@ libscilocalization_algo_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscilocalization_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libscilocalization_la_DEPENDENCIES = libscilocalization-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/api_scilab/libsciapi_scilab.la
+libscilocalization_la_DEPENDENCIES = libscilocalization-algo.la
 am__objects_4 = libscilocalization_la-gw_localization.lo \
        libscilocalization_la-sci_gettext.lo \
        libscilocalization_la-sci_dgettext.lo \
@@ -461,7 +458,7 @@ libscilocalization_algo_la_CFLAGS = $(libscilocalization_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(libscilocalization_la_SOURCES)
 INCLUDE_FLAGS = $(libscilocalization_la_CFLAGS)
-libscilocalization_la_LIBADD = libscilocalization-algo.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/api_scilab/libsciapi_scilab.la
+libscilocalization_la_LIBADD = libscilocalization-algo.la
 
 # $(top_builddir)/modules/io/libsciio.la
 #### Target ######
index 35a14cd..5c0575c 100644 (file)
@@ -13,12 +13,6 @@ MEXLIB_FLAGS = -I$(srcdir)/includes/ \
 
 MEXLIB_FLAGS += -I$(top_srcdir)/modules/string/includes
 
-MEXLIB_DEP =  \
-       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-       $(top_builddir)/modules/data_structures/libscidata_structures.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-    $(top_builddir)/modules/string/libscistring.la
-
 pkglib_LTLIBRARIES = libmat.la libmex.la libmx.la
 
 libmex_la_SOURCES = $(MEXLIB_C_SOURCES)
index d44a050..815ea2d 100644 (file)
@@ -109,21 +109,21 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libmex_la_rootdir)" \
        "$(DESTDIR)$(libmex_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libmat_la_DEPENDENCIES = $(MEXLIB_DEP)
+libmat_la_DEPENDENCIES =
 am__objects_1 = libmat_la-mexlib.lo libmat_la-sci_gateway.lo
 am_libmat_la_OBJECTS = $(am__objects_1)
 libmat_la_OBJECTS = $(am_libmat_la_OBJECTS)
 libmat_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmat_la_CFLAGS) \
        $(CFLAGS) $(libmat_la_LDFLAGS) $(LDFLAGS) -o $@
-libmex_la_DEPENDENCIES = $(MEXLIB_DEP)
+libmex_la_DEPENDENCIES =
 am__objects_2 = libmex_la-mexlib.lo libmex_la-sci_gateway.lo
 am_libmex_la_OBJECTS = $(am__objects_2)
 libmex_la_OBJECTS = $(am_libmex_la_OBJECTS)
 libmex_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmex_la_CFLAGS) \
        $(CFLAGS) $(libmex_la_LDFLAGS) $(LDFLAGS) -o $@
-libmx_la_DEPENDENCIES = $(MEXLIB_DEP)
+libmx_la_DEPENDENCIES =
 am__objects_3 = libmx_la-mexlib.lo libmx_la-sci_gateway.lo
 am_libmx_la_OBJECTS = $(am__objects_3)
 libmx_la_OBJECTS = $(am_libmx_la_OBJECTS)
@@ -408,12 +408,6 @@ MEXLIB_FLAGS = -I$(srcdir)/includes/ \
        -I$(top_srcdir)/modules/elementary_functions/includes/ \
        -I$(top_srcdir)/modules/call_scilab/includes/ \
        -I$(top_srcdir)/modules/string/includes
-MEXLIB_DEP = \
-       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-       $(top_builddir)/modules/data_structures/libscidata_structures.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-    $(top_builddir)/modules/string/libscistring.la
-
 pkglib_LTLIBRARIES = libmat.la libmex.la libmx.la
 libmex_la_SOURCES = $(MEXLIB_C_SOURCES)
 libmex_la_LIBADD = $(MEXLIB_DEP)
index a190246..065a05e 100644 (file)
@@ -135,7 +135,7 @@ libscioptimization_algo_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FO
 libscioptimization_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) 
 libscioptimization_algo_la_CFLAGS = $(libscioptimization_la_CFLAGS)
 
-libscioptimization_la_LIBADD = libscioptimization-algo.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 
+libscioptimization_la_LIBADD = libscioptimization-algo.la 
 
 
 #### Target ######
index aa07ae8..159afbd 100644 (file)
@@ -132,12 +132,7 @@ am_libscioptimization_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2) $(am__objects_3)
 libscioptimization_algo_la_OBJECTS =  \
        $(am_libscioptimization_algo_la_OBJECTS)
-libscioptimization_la_DEPENDENCIES = libscioptimization-algo.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
+libscioptimization_la_DEPENDENCIES = libscioptimization-algo.la
 am__objects_4 = libscioptimization_la-sci_semidef.lo \
        libscioptimization_la-sci_qld.lo \
        libscioptimization_la-gw_optimization.lo \
@@ -560,7 +555,7 @@ libscioptimization_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscioptimization_algo_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FORTRAN_SOURCES) $(MINPACK_SOURCES)
 libscioptimization_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) 
 libscioptimization_algo_la_CFLAGS = $(libscioptimization_la_CFLAGS)
-libscioptimization_la_LIBADD = libscioptimization-algo.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 
+libscioptimization_la_LIBADD = libscioptimization-algo.la 
 
 #### Target ######
 modulename = optimization
index c8b9dbd..195ead3 100644 (file)
@@ -96,9 +96,8 @@ libscioutput_stream_algo_la_CPPFLAGS = $(libscioutput_stream_la_CPPFLAGS)
 CHECK_SRC= $(OUTPUT_STREAM_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscioutput_stream_la_CFLAGS)
 
-# Many stuff depends on this one ... commented
 libscioutput_stream_la_LIBADD =  libscioutput_stream-algo.la 
-#$(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la
+
 #### Target ######
 modulename=output_stream
 
index a470283..444b565 100644 (file)
@@ -527,10 +527,8 @@ libscioutput_stream_algo_la_CPPFLAGS = $(libscioutput_stream_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(OUTPUT_STREAM_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscioutput_stream_la_CFLAGS)
-
-# Many stuff depends on this one ... commented
 libscioutput_stream_la_LIBADD = libscioutput_stream-algo.la 
-#$(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la
+
 #### Target ######
 modulename = output_stream
 
index 12fba74..4ddae02 100644 (file)
@@ -36,17 +36,13 @@ libsciparallel_la_CPPFLAGS= $(OPENMP_CXXFLAGS) \
 
 
 pkglib_LTLIBRARIES = libsciparallel.la
-#noinst_LTLIBRARIES = libsciparallel-algo.la
 
 libsciparallel_la_LDFLAGS = $(OPENMP_LIBS) -version-number $(SCILAB_LIBRARY_VERSION)
 
-#libsciparallel_la_LIBADD = libsciparallel-algo.la
 
 if OPENMP
-#libsciparallel_algo_la_SOURCES = $(PARALLEL_C_SOURCES) $(PARALLEL_CPP_SOURCES)
 libsciparallel_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
-#libsciparallel_algo_la_CFLAGS = $(libsciparallel_la_CFLAGS)
-#libsciparallel_algo_la_CPPFLAGS = $(libsciparallel_la_CPPFLAGS)
+
 else
 libsciparallel_la_SOURCES = src/noparallel/noparallel.h \
 src/noparallel/noparallel.c
index b183ba4..9669d92 100644 (file)
@@ -436,17 +436,10 @@ libsciparallel_la_CPPFLAGS = $(OPENMP_CXXFLAGS) \
 -I$(top_srcdir)/modules/dynamic_link/includes
 
 pkglib_LTLIBRARIES = libsciparallel.la
-#noinst_LTLIBRARIES = libsciparallel-algo.la
 libsciparallel_la_LDFLAGS = $(OPENMP_LIBS) -version-number $(SCILAB_LIBRARY_VERSION)
-#libsciparallel_algo_la_CFLAGS = $(libsciparallel_la_CFLAGS)
-#libsciparallel_algo_la_CPPFLAGS = $(libsciparallel_la_CPPFLAGS)
 @OPENMP_FALSE@libsciparallel_la_SOURCES = src/noparallel/noparallel.h \
 @OPENMP_FALSE@src/noparallel/noparallel.c
 
-
-#libsciparallel_la_LIBADD = libsciparallel-algo.la
-
-#libsciparallel_algo_la_SOURCES = $(PARALLEL_C_SOURCES) $(PARALLEL_CPP_SOURCES)
 @OPENMP_TRUE@libsciparallel_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
index ce08111..988c332 100644 (file)
@@ -29,8 +29,6 @@ libsciparameters_la_SOURCES = $(PARAMETERS_C_SOURCES)
 CHECK_SRC= $(libsciparameters_la_SOURCES)
 INCLUDE_FLAGS = $(libsciparameters_la_CFLAGS) 
 
-libsciparameters_la_LIBADD =  $(top_builddir)/modules/api_scilab/libsciapi_scilab.la
-
 #### Target ######
 modulename=parameters
 
index 573f2e3..ebcc27d 100644 (file)
@@ -113,8 +113,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libparameters_la_etcdir)" \
        "$(DESTDIR)$(libparameters_la_rootdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libsciparameters_la_DEPENDENCIES =  \
-       $(top_builddir)/modules/api_scilab/libsciapi_scilab.la
+libsciparameters_la_LIBADD =
 am__objects_1 = libsciparameters_la-parameters.lo
 am_libsciparameters_la_OBJECTS = $(am__objects_1)
 libsciparameters_la_OBJECTS = $(am_libsciparameters_la_OBJECTS)
@@ -405,7 +404,6 @@ libsciparameters_la_SOURCES = $(PARAMETERS_C_SOURCES)
 # For the code check (splint)
 CHECK_SRC = $(libsciparameters_la_SOURCES)
 INCLUDE_FLAGS = $(libsciparameters_la_CFLAGS) 
-libsciparameters_la_LIBADD = $(top_builddir)/modules/api_scilab/libsciapi_scilab.la
 
 #### Target ######
 modulename = parameters
index 3aa1ffa..f57241b 100644 (file)
@@ -119,7 +119,7 @@ libscipolynomials_algo_la_CFLAGS = $(libscipolynomials_la_CFLAGS)
 CHECK_SRC= ) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscipolynomials_la_CFLAGS)
 
-libscipolynomials_la_LIBADD = libscipolynomials-algo.la $(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/output_stream/libscioutput_stream.la
+libscipolynomials_la_LIBADD = libscipolynomials-algo.la
 
 #### Target ######
 modulename=polynomials
index 46dc06a..4b39206 100644 (file)
@@ -123,12 +123,7 @@ am__objects_1 = residu.lo imptra.lo dmpadj.lo impins.lo dpmul1.lo \
 am_libscipolynomials_algo_la_OBJECTS = $(am__objects_1)
 libscipolynomials_algo_la_OBJECTS =  \
        $(am_libscipolynomials_algo_la_OBJECTS)
-libscipolynomials_la_DEPENDENCIES = libscipolynomials-algo.la \
-       $(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/output_stream/libscioutput_stream.la
+libscipolynomials_la_DEPENDENCIES = libscipolynomials-algo.la
 am__objects_2 = sci_f_simp.lo sci_f_poly.lo sci_f_varn.lo sci_f_sum.lo \
        sci_f_div.lo sci_f_diag.lo sci_f_prod.lo polops.lo \
        sci_f_bezout.lo sci_f_triu_tril.lo sci_f_roots.lo \
@@ -545,7 +540,7 @@ libscipolynomials_algo_la_CFLAGS = $(libscipolynomials_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = ) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscipolynomials_la_CFLAGS)
-libscipolynomials_la_LIBADD = libscipolynomials-algo.la $(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/output_stream/libscioutput_stream.la
+libscipolynomials_la_LIBADD = libscipolynomials-algo.la
 
 #### Target ######
 modulename = polynomials
index 6635df1..22a26f7 100644 (file)
@@ -59,7 +59,7 @@ libscirandlib_algo_la_CFLAGS = $(libscirandlib_la_CFLAGS)
 CHECK_SRC= $(RANDLIB_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscirandlib_la_CFLAGS)
 
-libscirandlib_la_LIBADD =  libscirandlib-algo.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+libscirandlib_la_LIBADD =  libscirandlib-algo.la
 
 
 
index c2e4241..25673cd 100644 (file)
@@ -122,9 +122,7 @@ am__objects_2 = gennf.lo genchi.lo setgmn.lo gengam.lo snorm.lo \
        genexp.lo genmul.lo genprm.lo gennor.lo
 am_libscirandlib_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscirandlib_algo_la_OBJECTS = $(am_libscirandlib_algo_la_OBJECTS)
-libscirandlib_la_DEPENDENCIES = libscirandlib-algo.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+libscirandlib_la_DEPENDENCIES = libscirandlib-algo.la
 am__objects_3 = libscirandlib_la-gw_randlib.lo \
        libscirandlib_la-sci_grand.lo
 am_libscirandlib_la_OBJECTS = $(am__objects_3)
@@ -460,7 +458,7 @@ libscirandlib_algo_la_CFLAGS = $(libscirandlib_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(RANDLIB_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscirandlib_la_CFLAGS)
-libscirandlib_la_LIBADD = libscirandlib-algo.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+libscirandlib_la_LIBADD = libscirandlib-algo.la
 
 #### Target ######
 modulename = randlib
index ff73308..1356c62 100644 (file)
@@ -307,11 +307,6 @@ SWIG_WRAPPERS = src/jni/FigureScilabCall.i
 # For the code check (splint)
 INCLUDE_FLAGS = $(libscirenderer_la_CFLAGS)
 
-## Libraries necessary
-## Change to include other Scilab modules/lib
-# cyclic $(top_builddir)/modules/graphics/libscigraphics.la 
-libscirenderer_la_LIBADD =  $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
 # needs the rendererer before $(top_builddir)/modules/jvm/libscijvm.la
 
 
index 4cd74b9..f3459f3 100644 (file)
@@ -114,8 +114,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscirenderer_la_etcdir)" \
        "$(DESTDIR)$(libscirenderer_la_rootdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libscirenderer_la_DEPENDENCIES = $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscirenderer_la_LIBADD =
 am__objects_1 = libscirenderer_la-DrawableSubwinFactory.lo \
        libscirenderer_la-DrawableSubwin.lo \
        libscirenderer_la-DrawableFigureJoGL.lo \
@@ -948,9 +947,6 @@ SWIG_WRAPPERS = src/jni/FigureScilabCall.i
 # For the code check (splint)
 INCLUDE_FLAGS = $(libscirenderer_la_CFLAGS)
 
-# cyclic $(top_builddir)/modules/graphics/libscigraphics.la 
-libscirenderer_la_LIBADD = $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
 # needs the rendererer before $(top_builddir)/modules/jvm/libscijvm.la
 GIWS_WRAPPERS = src/jni/ArcFillDrawerGL.giws.xml \
 src/jni/ArcLineDrawerGL.giws.xml \
index fd3bac0..1140e11 100644 (file)
@@ -133,20 +133,7 @@ libsciscicos_algo_la_CFLAGS = $(libsciscicos_la_CFLAGS)
 CHECK_SRC= $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciscicos_la_CFLAGS)
 
-libsciscicos_la_LIBADD = libsciscicos-algo.la $(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/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)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la \
-$(top_builddir)/modules/arnoldi/libsciarnoldi.la
+libsciscicos_la_LIBADD = libsciscicos-algo.la
 
 if GUI
 libsciscicos_la_LIBADD += $(top_builddir)/modules/graphics/libscigraphics.la 
index cd27fd3..2bebc69 100644 (file)
@@ -176,19 +176,6 @@ am__libsciscicos_algo_la_SOURCES_DIST = src/c/tree.c \
 libsciscicos_algo_la_OBJECTS = $(am_libsciscicos_algo_la_OBJECTS)
 @XCOS_TRUE@am_libsciscicos_algo_la_rpath =
 @XCOS_TRUE@libsciscicos_la_DEPENDENCIES = libsciscicos-algo.la \
-@XCOS_TRUE@    $(top_builddir)/modules/string/libscistring.la \
-@XCOS_TRUE@    $(top_builddir)/modules/mexlib/libmat.la \
-@XCOS_TRUE@    $(top_builddir)/modules/mexlib/libmx.la \
-@XCOS_TRUE@    $(top_builddir)/modules/intersci/libsciintersci.la \
-@XCOS_TRUE@    $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-@XCOS_TRUE@    $(top_builddir)/modules/time/libscitime.la \
-@XCOS_TRUE@    $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-@XCOS_TRUE@    $(top_builddir)/modules/scicos/libscisundials.la \
-@XCOS_TRUE@    $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
-@XCOS_TRUE@    $(top_builddir)/modules/mexlib/libmex.la \
-@XCOS_TRUE@    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-@XCOS_TRUE@    $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-@XCOS_TRUE@    $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
 @XCOS_TRUE@    $(am__append_3)
 am__libsciscicos_la_SOURCES_DIST = src/c/noscicos/noscicos.c \
        sci_gateway/c/gw_scicos.c sci_gateway/c/sci_buildouttb.c \
@@ -933,19 +920,6 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @XCOS_TRUE@CHECK_SRC = $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES)
 @XCOS_TRUE@INCLUDE_FLAGS = $(libsciscicos_la_CFLAGS)
 @XCOS_TRUE@libsciscicos_la_LIBADD = libsciscicos-algo.la \
-@XCOS_TRUE@    $(top_builddir)/modules/string/libscistring.la \
-@XCOS_TRUE@    $(top_builddir)/modules/mexlib/libmat.la \
-@XCOS_TRUE@    $(top_builddir)/modules/mexlib/libmx.la \
-@XCOS_TRUE@    $(top_builddir)/modules/intersci/libsciintersci.la \
-@XCOS_TRUE@    $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-@XCOS_TRUE@    $(top_builddir)/modules/time/libscitime.la \
-@XCOS_TRUE@    $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-@XCOS_TRUE@    $(top_builddir)/modules/scicos/libscisundials.la \
-@XCOS_TRUE@    $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
-@XCOS_TRUE@    $(top_builddir)/modules/mexlib/libmex.la \
-@XCOS_TRUE@    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-@XCOS_TRUE@    $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-@XCOS_TRUE@    $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
 @XCOS_TRUE@    $(am__append_3)
 
 #### scicos : Conf files ####
index 7fe1816..d39431f 100644 (file)
@@ -488,16 +488,6 @@ CLEANFILES=$(top_srcdir)/modules/scicos_blocks/includes/blocks.h \
        $(srcdir)/macros/Hydraulics/*.moc \
        $(BASE_PATH)/linenum.ml
 
-
-
-
-# cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la
-libsciscicos_blocks_la_LIBADD =   $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.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
-
-if GUI
-libsciscicos_blocks_la_LIBADD += $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/renderer/libscirenderer.la
-endif
-
 #### scicos_blocks : Conf files ####
 libsciscicos_blocks_la_rootdir = $(mydatadir)
 libsciscicos_blocks_la_root_DATA =  license.txt 
index e51c4a7..da276b4 100644 (file)
@@ -66,7 +66,6 @@ DIST_COMMON = $(am__libsciscicos_blocks_la_include_HEADERS_DIST) \
        $(top_srcdir)/Makefile.incl.am
 @NEED_JAVA_TRUE@am__append_1 = java
 @GIWS_TRUE@@XCOS_TRUE@am__append_2 = giws
-@GUI_TRUE@@XCOS_TRUE@am__append_3 = $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/renderer/libscirenderer.la
 subdir = modules/scicos_blocks
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
@@ -117,17 +116,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libsciscicos_blocks_la_hdf5blocksdir)" \
        "$(DESTDIR)$(libsciscicos_blocks_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-@XCOS_TRUE@libsciscicos_blocks_la_DEPENDENCIES =  \
-@XCOS_TRUE@    $(top_builddir)/modules/cacsd/libscicacsd.la \
-@XCOS_TRUE@    $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-@XCOS_TRUE@    $(top_builddir)/modules/polynomials/libscipolynomials.la \
-@XCOS_TRUE@    $(top_builddir)/modules/fileio/libscifileio.la \
-@XCOS_TRUE@    $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
-@XCOS_TRUE@    $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-@XCOS_TRUE@    $(top_builddir)/modules/string/libscistring.la \
-@XCOS_TRUE@    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-@XCOS_TRUE@    $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-@XCOS_TRUE@    $(am__append_3)
+libsciscicos_blocks_la_LIBADD =
 am__libsciscicos_blocks_la_SOURCES_DIST = src/c/absblk.c \
        src/c/absolute_value.c src/c/acos_blk.c src/c/acosh_blk.c \
        src/c/andlog.c src/c/asin_blk.c src/c/asinh_blk.c \
@@ -1406,19 +1395,6 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @XCOS_TRUE@    $(BASE_PATH)/linenum.ml
 
 
-# cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la
-@XCOS_TRUE@libsciscicos_blocks_la_LIBADD =  \
-@XCOS_TRUE@    $(top_builddir)/modules/cacsd/libscicacsd.la \
-@XCOS_TRUE@    $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-@XCOS_TRUE@    $(top_builddir)/modules/polynomials/libscipolynomials.la \
-@XCOS_TRUE@    $(top_builddir)/modules/fileio/libscifileio.la \
-@XCOS_TRUE@    $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
-@XCOS_TRUE@    $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-@XCOS_TRUE@    $(top_builddir)/modules/string/libscistring.la \
-@XCOS_TRUE@    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-@XCOS_TRUE@    $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-@XCOS_TRUE@    $(am__append_3)
-
 #### scicos_blocks : Conf files ####
 @XCOS_TRUE@libsciscicos_blocks_la_rootdir = $(mydatadir)
 @XCOS_TRUE@libsciscicos_blocks_la_root_DATA = license.txt 
index bf97949..65b8a2a 100644 (file)
@@ -105,11 +105,7 @@ if SWIG
     BUILT_SOURCES=swig
 endif
 
-libsciscinotes_la_LIBADD = libsciscinotes-algo.la \
-    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-    $(top_builddir)/modules/jvm/libscijvm.la \
-    $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libsciscinotes_la_LIBADD = libsciscinotes-algo.la
 
 #### scinotes : gateway declaration ####
 libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index d86cf29..71c4ae1 100644 (file)
@@ -134,10 +134,7 @@ libsciscinotes_disable_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libsciscinotes_disable_la_CFLAGS) $(CFLAGS) \
        $(libsciscinotes_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-libsciscinotes_la_DEPENDENCIES = libsciscinotes-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/jvm/libscijvm.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciscinotes_la_DEPENDENCIES = libsciscinotes-algo.la
 am__objects_5 = libsciscinotes_la-gw_scinotes.lo
 am__objects_6 = libsciscinotes_la-sci_scinotes.lo \
        libsciscinotes_la-sci_closeSciNotesFromScilab.lo
@@ -563,11 +560,7 @@ INCLUDE_FLAGS = $(libsciscinotes_la_CFLAGS)
 
 #### SWIG Declaration ####
 SWIG_WRAPPERS = src/jni/ScilabKeywords.i 
-libsciscinotes_la_LIBADD = libsciscinotes-algo.la \
-    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-    $(top_builddir)/modules/jvm/libscijvm.la \
-    $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libsciscinotes_la_LIBADD = libsciscinotes-algo.la
 
 #### scinotes : gateway declaration ####
 libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 0ba29ea..adf83ee 100644 (file)
@@ -109,7 +109,7 @@ libscisignal_processing_algo_la_CFLAGS = $(libscisignal_processing_la_CFLAGS)
 CHECK_SRC= $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscisignal_processing_la_CFLAGS)
 
-libscisignal_processing_la_LIBADD = libscisignal_processing-algo.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/output_stream/libscioutput_stream.la 
+libscisignal_processing_la_LIBADD = libscisignal_processing-algo.la
 
 #### Target ######
 modulename=signal_processing
index d08a590..7d354be 100644 (file)
@@ -126,11 +126,7 @@ am_libscisignal_processing_algo_la_OBJECTS = $(am__objects_1) \
 libscisignal_processing_algo_la_OBJECTS =  \
        $(am_libscisignal_processing_algo_la_OBJECTS)
 libscisignal_processing_la_DEPENDENCIES =  \
-       libscisignal_processing-algo.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/output_stream/libscioutput_stream.la
+       libscisignal_processing-algo.la
 am__objects_3 = libscisignal_processing_la-sci_remez.lo \
        libscisignal_processing_la-sci_rpem.lo \
        libscisignal_processing_la-sci_corr.lo \
@@ -532,7 +528,7 @@ libscisignal_processing_algo_la_CFLAGS = $(libscisignal_processing_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscisignal_processing_la_CFLAGS)
-libscisignal_processing_la_LIBADD = libscisignal_processing-algo.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/output_stream/libscioutput_stream.la 
+libscisignal_processing_la_LIBADD = libscisignal_processing-algo.la
 
 #### Target ######
 modulename = signal_processing
index 80bc5b2..987c9d3 100644 (file)
@@ -25,8 +25,6 @@ libscisound_la_SOURCES = $(GATEWAY_C_SOURCES)
 CHECK_SRC= $(libscisound_la_SOURCES)
 INCLUDE_FLAGS = $(libscisound_la_CFLAGS)
 
-libscisound_la_LIBADD =   $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
 
 #### Target ######
 modulename=sound
index f1a5549..7266b18 100644 (file)
@@ -108,9 +108,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscisound_la_rootdir)" \
        "$(DESTDIR)$(libscisound_la_sci_gatewaydir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libscisound_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscisound_la_LIBADD =
 am__objects_1 = libscisound_la-gw_sound.lo libscisound_la-sci_beep.lo \
        libscisound_la-sci_PlaySound.lo
 am_libscisound_la_OBJECTS = $(am__objects_1)
@@ -404,7 +402,6 @@ libscisound_la_SOURCES = $(GATEWAY_C_SOURCES)
 # For the code check (splint)
 CHECK_SRC = $(libscisound_la_SOURCES)
 INCLUDE_FLAGS = $(libscisound_la_CFLAGS)
-libscisound_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 
 #### Target ######
 modulename = sound
index 4b92f26..632916f 100644 (file)
@@ -174,8 +174,7 @@ libscisparse_algo_la_CFLAGS = $(libscisparse_la_CFLAGS)
 CHECK_SRC = $(SPARSE_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscisparse_la_CFLAGS)
 
-libscisparse_la_LIBADD = libscisparse-algo.la $(top_builddir)/modules/io/libsciio.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 
-
+libscisparse_la_LIBADD = libscisparse-algo.la
 
 #### Target ######
 modulename=sparse
index d348671..6ad46a1 100644 (file)
@@ -134,14 +134,7 @@ am__objects_2 = spcompack.lo wsposp.lo dspmax.lo findl.lo spcho1.lo \
        ta2lpd.lo
 am_libscisparse_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscisparse_algo_la_OBJECTS = $(am_libscisparse_algo_la_OBJECTS)
-libscisparse_la_DEPENDENCIES = libscisparse-algo.la \
-       $(top_builddir)/modules/io/libsciio.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
+libscisparse_la_DEPENDENCIES = libscisparse-algo.la
 am__objects_3 = libscisparse_la-sci_spcompa.lo \
        libscisparse_la-sci_full.lo libscisparse_la-sci_blkslvi.lo \
        libscisparse_la-sci_inpnvi.lo libscisparse_la-sci_nnz.lo \
@@ -613,7 +606,7 @@ libscisparse_algo_la_CFLAGS = $(libscisparse_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(SPARSE_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscisparse_la_CFLAGS)
-libscisparse_la_LIBADD = libscisparse-algo.la $(top_builddir)/modules/io/libsciio.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 
+libscisparse_la_LIBADD = libscisparse-algo.la
 
 #### Target ######
 modulename = sparse
index 9a1452b..9507b9e 100644 (file)
@@ -70,7 +70,7 @@ libscispecial_functions_algo_la_CFLAGS = $(libscispecial_functions_la_CFLAGS)
 CHECK_SRC= $(SPECIAL_FUNCTIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscispecial_functions_la_CFLAGS)
 
-libscispecial_functions_la_LIBADD = libscispecial_functions-algo.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 = libscispecial_functions-algo.la
 
 #### Target ######
 modulename=special_functions
index 505c59b..23de82f 100644 (file)
@@ -119,10 +119,7 @@ am_libscispecial_functions_algo_la_OBJECTS = $(am__objects_1) \
 libscispecial_functions_algo_la_OBJECTS =  \
        $(am_libscispecial_functions_algo_la_OBJECTS)
 libscispecial_functions_la_DEPENDENCIES =  \
-       libscispecial_functions-algo.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-algo.la
 am__objects_4 = libscispecial_functions_la-sci_dlgamma.lo \
        libscispecial_functions_la-sci_bessely.lo \
        libscispecial_functions_la-sci_beta.lo \
@@ -488,7 +485,7 @@ libscispecial_functions_algo_la_CFLAGS = $(libscispecial_functions_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(SPECIAL_FUNCTIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscispecial_functions_la_CFLAGS)
-libscispecial_functions_la_LIBADD = libscispecial_functions-algo.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 = libscispecial_functions-algo.la
 
 #### Target ######
 modulename = special_functions
index 97d3a68..276cb71 100644 (file)
@@ -41,7 +41,8 @@ libscispreadsheet_algo_la_CFLAGS = $(libscispreadsheet_la_CFLAGS)
 CHECK_SRC= $(SPREADSHEET_C_SOURCES) $(GATEWAY_C_SOURCES) $(RIPOLE_SOURCES)
 INCLUDE_FLAGS = $(libscispreadsheet_la_CFLAGS)
 
-libscispreadsheet_la_LIBADD = libscispreadsheet-algo.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscispreadsheet_la_LIBADD = libscispreadsheet-algo.la 
+
 #### Target ######
 modulename=spreadsheet
 
index 800c052..02c2cd0 100644 (file)
@@ -125,10 +125,7 @@ libscispreadsheet_algo_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscispreadsheet_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libscispreadsheet_la_DEPENDENCIES = libscispreadsheet-algo.la \
-       $(top_builddir)/modules/fileio/libscifileio.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscispreadsheet_la_DEPENDENCIES = libscispreadsheet-algo.la
 am__objects_3 = libscispreadsheet_la-gw_spreadsheet.lo \
        libscispreadsheet_la-sci_xls_read.lo \
        libscispreadsheet_la-sci_xls_open.lo
@@ -441,7 +438,8 @@ libscispreadsheet_algo_la_CFLAGS = $(libscispreadsheet_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(SPREADSHEET_C_SOURCES) $(GATEWAY_C_SOURCES) $(RIPOLE_SOURCES)
 INCLUDE_FLAGS = $(libscispreadsheet_la_CFLAGS)
-libscispreadsheet_la_LIBADD = libscispreadsheet-algo.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscispreadsheet_la_LIBADD = libscispreadsheet-algo.la 
+
 #### Target ######
 modulename = spreadsheet
 
index e045928..3798d0c 100644 (file)
@@ -100,7 +100,7 @@ libscistatistics_algo_la_CFLAGS = $(libscistatistics_la_CFLAGS)
 CHECK_SRC= $(STATISTICS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscistatistics_la_CFLAGS)
 
-libscistatistics_la_LIBADD = libscistatistics-algo.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
+libscistatistics_la_LIBADD = libscistatistics-algo.la 
 
 #### Target ######
 modulename=statistics
index a59ed2b..6c4d2c7 100644 (file)
@@ -126,8 +126,7 @@ am_libscistatistics_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2)
 libscistatistics_algo_la_OBJECTS =  \
        $(am_libscistatistics_algo_la_OBJECTS)
-libscistatistics_la_DEPENDENCIES = libscistatistics-algo.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscistatistics_la_DEPENDENCIES = libscistatistics-algo.la
 am__objects_3 = libscistatistics_la-gw_statistics.lo \
        libscistatistics_la-sci_cdfchi.lo \
        libscistatistics_la-sci_cdft.lo \
@@ -518,7 +517,7 @@ libscistatistics_algo_la_CFLAGS = $(libscistatistics_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(STATISTICS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscistatistics_la_CFLAGS)
-libscistatistics_la_LIBADD = libscistatistics-algo.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
+libscistatistics_la_LIBADD = libscistatistics-algo.la 
 
 #### Target ######
 modulename = statistics
index 875fd5e..d5ac8de 100644 (file)
@@ -88,8 +88,8 @@ CHECK_SRC= $(STRING_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscistring_la_CFLAGS)
 
 # commented since it is the first module to be processed
-#  $(top_builddir)/modules/polynomials/libscipolynomials.la 
-libscistring_la_LIBADD = libscistring-algo.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscistring_la_LIBADD = libscistring-algo.la 
+
 #### Target ######
 modulename=string
 
index 757a3ea..a7d8ff6 100644 (file)
@@ -139,11 +139,7 @@ libscistring_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscistring_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libscistring_la_DEPENDENCIES = libscistring-algo.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscistring_la_DEPENDENCIES = libscistring-algo.la
 am__objects_3 = libscistring_la-gw_string.lo \
        libscistring_la-sci_ascii.lo libscistring_la-sci_code2str.lo \
        libscistring_la-sci_convstr.lo libscistring_la-sci_emptystr.lo \
@@ -524,8 +520,8 @@ CHECK_SRC = $(STRING_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscistring_la_CFLAGS)
 
 # commented since it is the first module to be processed
-#  $(top_builddir)/modules/polynomials/libscipolynomials.la 
-libscistring_la_LIBADD = libscistring-algo.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscistring_la_LIBADD = libscistring-algo.la 
+
 #### Target ######
 modulename = string
 
index b96b95a..fe689ec 100644 (file)
@@ -35,7 +35,7 @@ libscisymbolic_algo_la_CFLAGS = $(libscisymbolic_la_CFLAGS)
 CHECK_SRC= $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscisymbolic_la_CFLAGS)
 
-libscisymbolic_la_LIBADD = libscisymbolic-algo.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+libscisymbolic_la_LIBADD = libscisymbolic-algo.la
 
 
 
index f7d1816..43f6698 100644 (file)
@@ -117,10 +117,7 @@ am__objects_1 = sci_f_addsubf.lo sci_f_mulf.lo sci_f_ldivf.lo \
        sci_f_rdivf.lo
 am_libscisymbolic_algo_la_OBJECTS = $(am__objects_1)
 libscisymbolic_algo_la_OBJECTS = $(am_libscisymbolic_algo_la_OBJECTS)
-libscisymbolic_la_DEPENDENCIES = libscisymbolic-algo.la \
-       $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+libscisymbolic_la_DEPENDENCIES = libscisymbolic-algo.la
 am__objects_2 = libscisymbolic_la-gw_symbolic.lo \
        libscisymbolic_la-sci_mulf.lo libscisymbolic_la-sci_ldivf.lo \
        libscisymbolic_la-sci_addsubf.lo \
@@ -433,7 +430,7 @@ libscisymbolic_algo_la_CFLAGS = $(libscisymbolic_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscisymbolic_la_CFLAGS)
-libscisymbolic_la_LIBADD = libscisymbolic-algo.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
+libscisymbolic_la_LIBADD = libscisymbolic-algo.la
 
 #### Target ######
 modulename = symbolic
index 72ed282..738aa80 100644 (file)
@@ -70,9 +70,7 @@ libscitclsci_algo_la_CFLAGS = $(libscitclsci_la_CFLAGS)
 CHECK_SRC= $(libscitclsci_la_SOURCES)
 INCLUDE_FLAGS = $(libscitclsci_la_CFLAGS)
 
-libscitclsci_la_LIBADD = libscitclsci-algo.la $(top_builddir)/modules/fileio/libscifileio.la \
-                                                       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                                                       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscitclsci_la_LIBADD = libscitclsci-algo.la 
 #### Target ######
 modulename=tclsci
 
index 0802664..d08b77a 100644 (file)
@@ -138,10 +138,7 @@ libscitclsci_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscitclsci_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libscitclsci_la_DEPENDENCIES = libscitclsci-algo.la \
-       $(top_builddir)/modules/fileio/libscifileio.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscitclsci_la_DEPENDENCIES = libscitclsci-algo.la
 am__libscitclsci_la_SOURCES_DIST = sci_gateway/c/sci_opentk.c \
        sci_gateway/c/sci_TCL_SetVar.c \
        sci_gateway/c/sci_TCL_ExistVar.c \
@@ -499,10 +496,7 @@ libscitclsci_algo_la_CFLAGS = $(libscitclsci_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(libscitclsci_la_SOURCES)
 INCLUDE_FLAGS = $(libscitclsci_la_CFLAGS)
-libscitclsci_la_LIBADD = libscitclsci-algo.la $(top_builddir)/modules/fileio/libscifileio.la \
-                                                       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                                                       $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libscitclsci_la_LIBADD = libscitclsci-algo.la 
 #### Target ######
 modulename = tclsci
 
index 52ce847..7225658 100644 (file)
@@ -35,8 +35,7 @@ libscitime_algo_la_CFLAGS = $(libscitime_la_CFLAGS)
 CHECK_SRC= $(libscitime_la_SOURCES)
 INCLUDE_FLAGS = $(libscitime_la_CFLAGS)
 
-libscitime_la_LIBADD = libscitime-algo.la  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libscitime_la_LIBADD = libscitime-algo.la
 
 
 
index ce8e6ac..6a99566 100644 (file)
@@ -119,9 +119,7 @@ libscitime_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscitime_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-libscitime_la_DEPENDENCIES = libscitime-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscitime_la_DEPENDENCIES = libscitime-algo.la
 am__objects_2 = libscitime_la-sci_realtime.lo \
        libscitime_la-sci_timer.lo libscitime_la-sci_calendar.lo \
        libscitime_la-sci_xpause.lo libscitime_la-sci_sleep.lo \
@@ -430,7 +428,7 @@ libscitime_algo_la_CFLAGS = $(libscitime_la_CFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(libscitime_la_SOURCES)
 INCLUDE_FLAGS = $(libscitime_la_CFLAGS)
-libscitime_la_LIBADD = libscitime-algo.la  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscitime_la_LIBADD = libscitime-algo.la
 
 #### Target ######
 modulename = time
index e7170c0..d860f44 100644 (file)
@@ -81,12 +81,6 @@ if SWIG
 BUILT_SOURCES=swig
 endif
 
-libscitypes_la_LIBADD =  \
-$(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
-#libscitypes-algo.la
-
-
 #### types : gateway declaration ####
 libscitypes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscitypes_la_sci_gateway_DATA =
index 9aea009..171781c 100644 (file)
@@ -123,9 +123,7 @@ libscitypes_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscitypes_disable_la_CFLAGS) $(CFLAGS) \
        $(libscitypes_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-libscitypes_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscitypes_la_LIBADD =
 am_libscitypes_la_OBJECTS = $(am__objects_1) $(am__objects_1) \
        $(am__objects_1)
 libscitypes_la_OBJECTS = $(am_libscitypes_la_OBJECTS)
@@ -503,11 +501,6 @@ INCLUDE_FLAGS = $(libscitypes_la_CFLAGS)
 
 #### SWIG Declaration ####
 SWIG_WRAPPERS = src/jni/sci_types.i
-libscitypes_la_LIBADD = \
-$(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
-
-#libscitypes-algo.la
 
 #### types : gateway declaration ####
 libscitypes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 29ce6b0..1e13dbb 100644 (file)
@@ -93,11 +93,7 @@ libsciui_data_algo_la_CPPFLAGS = $(libsciui_data_la_CPPFLAGS)
 CHECK_SRC= $(UI_DATA_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciui_data_la_CFLAGS)
 
-libsciui_data_la_LIBADD =  \
-libsciui_data-algo.la \
-$(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/jvm/libscijvm.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciui_data_la_LIBADD = libsciui_data-algo.la
 
 
 #### ui_data : gateway declaration ####
index 31df2a3..3a950cb 100644 (file)
@@ -134,10 +134,7 @@ libsciui_data_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libsciui_data_disable_la_CFLAGS) $(CFLAGS) \
        $(libsciui_data_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-libsciui_data_la_DEPENDENCIES = libsciui_data-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/jvm/libscijvm.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciui_data_la_DEPENDENCIES = libsciui_data-algo.la
 am__objects_5 = libsciui_data_la-gw_ui_data.lo
 am__objects_6 = libsciui_data_la-sci_editvar.lo \
        libsciui_data_la-sci_browsevar.lo
@@ -558,12 +555,7 @@ libsciui_data_algo_la_CPPFLAGS = $(libsciui_data_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(UI_DATA_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciui_data_la_CFLAGS)
-libsciui_data_la_LIBADD = \
-libsciui_data-algo.la \
-$(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/jvm/libscijvm.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libsciui_data_la_LIBADD = libsciui_data-algo.la
 
 #### ui_data : gateway declaration ####
 libsciui_data_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 8648c52..ab43426 100644 (file)
@@ -64,12 +64,7 @@ libsciumfpack_algo_la_CFLAGS = $(libsciumfpack_la_CFLAGS)
 CHECK_SRC= $(libsciumfpack_la_SOURCES)
 INCLUDE_FLAGS = $(libsciumfpack_la_CFLAGS)
 
-libsciumfpack_la_LIBADD =  libsciumfpack-algo.la $(top_builddir)/modules/mexlib/libmx.la \
-$(top_builddir)/modules/mexlib/libmat.la \
-$(top_builddir)/modules/sparse/libscisparse.la \
-$(top_builddir)/modules/mexlib/libmex.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libsciumfpack_la_LIBADD =  libsciumfpack-algo.la
 
 libsciumfpack_la_CFLAGS= -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
index 5e81bcf..a9fe1c9 100644 (file)
@@ -129,12 +129,7 @@ libsciumfpack_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(libsciumfpack_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
 @UMFPACK_TRUE@am_libsciumfpack_algo_la_rpath =
-@UMFPACK_TRUE@libsciumfpack_la_DEPENDENCIES = libsciumfpack-algo.la \
-@UMFPACK_TRUE@ $(top_builddir)/modules/mexlib/libmx.la \
-@UMFPACK_TRUE@ $(top_builddir)/modules/mexlib/libmat.la \
-@UMFPACK_TRUE@ $(top_builddir)/modules/sparse/libscisparse.la \
-@UMFPACK_TRUE@ $(top_builddir)/modules/mexlib/libmex.la \
-@UMFPACK_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la
+@UMFPACK_TRUE@libsciumfpack_la_DEPENDENCIES = libsciumfpack-algo.la
 am__libsciumfpack_la_SOURCES_DIST = src/noumfpack/noumfpack.c \
        src/c/taucs_scilab.c src/c/common_umfpack.c \
        src/c/with_umfpack.c sci_gateway/c/gw_umfpack.c \
@@ -489,12 +484,7 @@ libsciumfpack_la_etc_DATA = etc/umfpack.quit etc/umfpack.start
 # For the code check (splint)
 @UMFPACK_TRUE@CHECK_SRC = $(libsciumfpack_la_SOURCES)
 @UMFPACK_TRUE@INCLUDE_FLAGS = $(libsciumfpack_la_CFLAGS)
-@UMFPACK_TRUE@libsciumfpack_la_LIBADD = libsciumfpack-algo.la $(top_builddir)/modules/mexlib/libmx.la \
-@UMFPACK_TRUE@$(top_builddir)/modules/mexlib/libmat.la \
-@UMFPACK_TRUE@$(top_builddir)/modules/sparse/libscisparse.la \
-@UMFPACK_TRUE@$(top_builddir)/modules/mexlib/libmex.la \
-@UMFPACK_TRUE@$(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+@UMFPACK_TRUE@libsciumfpack_la_LIBADD = libsciumfpack-algo.la
 @UMFPACK_FALSE@libsciumfpack_la_CFLAGS = -I$(top_srcdir)/modules/api_scilab/includes \
 @UMFPACK_FALSE@-I$(top_srcdir)/modules/umfpack/includes/ \
 @UMFPACK_FALSE@-I$(top_srcdir)/modules/output_stream/includes
index 3467ecb..ae6a7cc 100644 (file)
@@ -22,9 +22,6 @@ libsciwindows_tools_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 # All the sources needed by libsciwindows_tools.la
 libsciwindows_tools_la_SOURCES = $(WINDOWS_TOOLS_C_SOURCES)
 
-## Libraries necessary
-## Change to include other Scilab modules/lib
-libsciwindows_tools_la_LIBADD =  $(top_builddir)/modules/output_stream/libscioutput_stream.la
 #### Name of the module and the path ######
 modulename=windows_tools
 
index 32f8240..1597ddd 100644 (file)
@@ -108,8 +108,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libsciwindows_tools_la_rootdir)" \
        "$(DESTDIR)$(libsciwindows_tools_la_sci_gatewaydir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libsciwindows_tools_la_DEPENDENCIES =  \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciwindows_tools_la_LIBADD =
 am__objects_1 = libsciwindows_tools_la-nowindows_tools.lo
 am_libsciwindows_tools_la_OBJECTS = $(am__objects_1)
 libsciwindows_tools_la_OBJECTS = $(am_libsciwindows_tools_la_OBJECTS)
@@ -405,7 +404,7 @@ libsciwindows_tools_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
 # All the sources needed by libsciwindows_tools.la
 libsciwindows_tools_la_SOURCES = $(WINDOWS_TOOLS_C_SOURCES)
-libsciwindows_tools_la_LIBADD = $(top_builddir)/modules/output_stream/libscioutput_stream.la
+
 #### Name of the module and the path ######
 modulename = windows_tools
 
index bc77808..7978c88 100644 (file)
@@ -118,12 +118,7 @@ INCLUDE_FLAGS = $(libscixcos_la_CFLAGS)
 
 
 
-libscixcos_la_LIBADD =  \
-libscixcos-algo.la \
-$(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/jvm/libscijvm.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libscixcos_la_LIBADD = libscixcos-algo.la
 
 #### xcos : gateway declaration ####
 libscixcos_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index e2cba9d..191eb6e 100644 (file)
@@ -135,10 +135,7 @@ libscixcos_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscixcos_disable_la_CFLAGS) $(CFLAGS) \
        $(libscixcos_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-libscixcos_la_DEPENDENCIES = libscixcos-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/jvm/libscijvm.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscixcos_la_DEPENDENCIES = libscixcos-algo.la
 am__objects_4 = libscixcos_la-gw_xcos.lo
 am__objects_5 = libscixcos_la-sci_Xcos.lo \
        libscixcos_la-sci_warnBlockByUID.lo \
@@ -528,12 +525,7 @@ libscixcos_algo_la_CPPFLAGS = $(libscixcos_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(XCOS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscixcos_la_CFLAGS)
-libscixcos_la_LIBADD = \
-libscixcos-algo.la \
-$(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/jvm/libscijvm.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libscixcos_la_LIBADD = libscixcos-algo.la
 
 #### xcos : gateway declaration ####
 libscixcos_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 1028c67..06d8e0a 100644 (file)
@@ -33,15 +33,15 @@ XML_C_SOURCES = src/c/XMLMlistsManagement.c
 XML_CPP_SOURCES = src/cpp/VariableScope.cpp \
                  src/cpp/XMLObject.cpp \
                  src/cpp/XMLDocument.cpp \
-                  src/cpp/XMLElement.cpp \
-                  src/cpp/XMLAttr.cpp \
-                  src/cpp/XMLNs.cpp \
-                  src/cpp/XMLNodeList.cpp \
-                  src/cpp/XMLNodeSet.cpp \
-                  src/cpp/XMLXPath.cpp \
-                  src/cpp/XMLList.cpp \
-                  src/cpp/XMLNotHandledElement.cpp \
-                  src/cpp/XMLValidation.cpp \
+          src/cpp/XMLElement.cpp \
+          src/cpp/XMLAttr.cpp \
+          src/cpp/XMLNs.cpp \
+          src/cpp/XMLNodeList.cpp \
+          src/cpp/XMLNodeSet.cpp \
+          src/cpp/XMLXPath.cpp \
+          src/cpp/XMLList.cpp \
+          src/cpp/XMLNotHandledElement.cpp \
+          src/cpp/XMLValidation.cpp \
                  src/cpp/XMLValidationDTD.cpp \
                  src/cpp/XMLValidationSchema.cpp \
                  src/cpp/XMLValidationRelaxNG.cpp
@@ -49,7 +49,7 @@ XML_CPP_SOURCES = src/cpp/VariableScope.cpp \
 GATEWAY_C_SOURCES = sci_gateway/c/gw_xml.c
 
 GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
-                      sci_gateway/cpp/sci_xmlXPath.cpp \
+              sci_gateway/cpp/sci_xmlXPath.cpp \
                      sci_gateway/cpp/sci_extraction.cpp \
                      sci_gateway/cpp/sci_insertion.cpp \
                      sci_gateway/cpp/sci_print.cpp \
@@ -113,16 +113,13 @@ libscixml_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 libscixml_algo_la_CFLAGS = $(libscixml_la_CFLAGS)
 libscixml_algo_la_CPPFLAGS = $(libscixml_la_CPPFLAGS)
 
+libscixml_la_LIBADD = libscixml-algo.la
+
 # For the code check (splint)
 CHECK_SRC= $(XML_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscixml_la_CFLAGS)
 
 
-libscixml_la_LIBADD = libscixml-algo.la \
-    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-    $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-    $(top_builddir)/modules/fileio/libscifileio.la
-
 #### xml : gateway declaration ####
 libscixml_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscixml_la_sci_gateway_DATA = sci_gateway/xml_gateway.xml
index f400624..4ca4688 100644 (file)
@@ -141,10 +141,7 @@ libscixml_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscixml_disable_la_CFLAGS) $(CFLAGS) \
        $(libscixml_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-libscixml_la_DEPENDENCIES = libscixml-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/fileio/libscifileio.la
+libscixml_la_DEPENDENCIES = libscixml-algo.la
 am__objects_4 = libscixml_la-gw_xml.lo
 am__objects_5 = libscixml_la-sci_xmlRead.lo \
        libscixml_la-sci_xmlXPath.lo libscixml_la-sci_extraction.lo \
@@ -534,22 +531,22 @@ XML_C_SOURCES = src/c/XMLMlistsManagement.c
 XML_CPP_SOURCES = src/cpp/VariableScope.cpp \
                  src/cpp/XMLObject.cpp \
                  src/cpp/XMLDocument.cpp \
-                  src/cpp/XMLElement.cpp \
-                  src/cpp/XMLAttr.cpp \
-                  src/cpp/XMLNs.cpp \
-                  src/cpp/XMLNodeList.cpp \
-                  src/cpp/XMLNodeSet.cpp \
-                  src/cpp/XMLXPath.cpp \
-                  src/cpp/XMLList.cpp \
-                  src/cpp/XMLNotHandledElement.cpp \
-                  src/cpp/XMLValidation.cpp \
+          src/cpp/XMLElement.cpp \
+          src/cpp/XMLAttr.cpp \
+          src/cpp/XMLNs.cpp \
+          src/cpp/XMLNodeList.cpp \
+          src/cpp/XMLNodeSet.cpp \
+          src/cpp/XMLXPath.cpp \
+          src/cpp/XMLList.cpp \
+          src/cpp/XMLNotHandledElement.cpp \
+          src/cpp/XMLValidation.cpp \
                  src/cpp/XMLValidationDTD.cpp \
                  src/cpp/XMLValidationSchema.cpp \
                  src/cpp/XMLValidationRelaxNG.cpp
 
 GATEWAY_C_SOURCES = sci_gateway/c/gw_xml.c
 GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
-                      sci_gateway/cpp/sci_xmlXPath.cpp \
+              sci_gateway/cpp/sci_xmlXPath.cpp \
                      sci_gateway/cpp/sci_extraction.cpp \
                      sci_gateway/cpp/sci_insertion.cpp \
                      sci_gateway/cpp/sci_print.cpp \
@@ -604,15 +601,11 @@ libscixml_algo_la_SOURCES = $(XML_C_SOURCES) $(XML_JNI_SOURCES) $(XML_CPP_SOURCE
 libscixml_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) 
 libscixml_algo_la_CFLAGS = $(libscixml_la_CFLAGS)
 libscixml_algo_la_CPPFLAGS = $(libscixml_la_CPPFLAGS)
+libscixml_la_LIBADD = libscixml-algo.la
 
 # For the code check (splint)
 CHECK_SRC = $(XML_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscixml_la_CFLAGS)
-libscixml_la_LIBADD = libscixml-algo.la \
-    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-    $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-    $(top_builddir)/modules/fileio/libscifileio.la
-
 
 #### xml : gateway declaration ####
 libscixml_la_sci_gatewaydir = $(mydatadir)/sci_gateway