summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-05-18 15:46:12 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-05-18 15:46:12 +0200
commit45ec359147aa402ae55dd73b52c999f000cb8737 (patch)
tree6a5077a4a58240219c2dc86e31f859993c707c02 /scilab/modules/Makefile.am
parenta66583f58f899651e6a15980e468589dac353617 (diff)
parent15e896803b094b0c66acdeac510f28cfbfd3db96 (diff)
downloadscilab-45ec359147aa402ae55dd73b52c999f000cb8737.zip
scilab-45ec359147aa402ae55dd73b52c999f000cb8737.tar.gz
Merge commit 'origin/master' into atoms
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index c114354..3d37140 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -176,7 +176,8 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
176 $(top_builddir)/modules/statistics/libscistatistics.la \ 176 $(top_builddir)/modules/statistics/libscistatistics.la \
177 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \ 177 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
178 $(top_builddir)/modules/interpolation/libsciinterpolation.la \ 178 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
179 $(top_builddir)/modules/string/libscistring.la 179 $(top_builddir)/modules/string/libscistring.la \
180 $(top_builddir)/modules/functions/libscifunctions.la
180 181
181OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \ 182OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \
182$(top_builddir)/modules/umfpack/libsciumfpack.la \ 183$(top_builddir)/modules/umfpack/libsciumfpack.la \