summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-07-15 17:04:44 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-07-15 17:04:44 +0200
commit9f38c14f4a63c79f742f39e4d12a05e60fa7aa49 (patch)
tree9dcfc2cd6b01dc0958458f730676df46b6f2114e /scilab/modules/Makefile.am
parentf3c8885458b015407655cb6b8dab7c3bc179316d (diff)
parent42422e1fa072aa3cdc2e4ca94494b3af694c444d (diff)
downloadscilab-9f38c14f4a63c79f742f39e4d12a05e60fa7aa49.zip
scilab-9f38c14f4a63c79f742f39e4d12a05e60fa7aa49.tar.gz
Merge commit 'origin/master' into atoms
Conflicts: scilab/configure scilab/etc/modules.xml.vc scilab/modules/Makefile.am scilab/modules/Makefile.in
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 80ce748..65dd000 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -81,7 +81,8 @@ genetic_algorithms \
81simulated_annealing \ 81simulated_annealing \
82parameters \ 82parameters \
83matio \ 83matio \
84atoms 84atoms \
85hdf5
85 86
86#umfpack 87#umfpack
87 88
@@ -178,7 +179,8 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
178 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \ 179 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
179 $(top_builddir)/modules/interpolation/libsciinterpolation.la \ 180 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
180 $(top_builddir)/modules/string/libscistring.la \ 181 $(top_builddir)/modules/string/libscistring.la \
181 $(top_builddir)/modules/functions/libscifunctions.la 182 $(top_builddir)/modules/functions/libscifunctions.la \
183 $(top_builddir)/modules/hdf5/libscihdf5.la
182 184
183OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \ 185OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \
184$(top_builddir)/modules/umfpack/libsciumfpack.la \ 186$(top_builddir)/modules/umfpack/libsciumfpack.la \