summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2010-05-20 15:12:15 +0200
committerBruno JOFRET <bruno.jofret@scilab.org>2010-05-20 15:12:15 +0200
commitb1a5f0adddcb10e6baafc03627777c14f15c1461 (patch)
tree8f9ff27773f26c4c86328c3921e331122cba3ae5 /scilab/modules/Makefile.am
parent59702160b83af483be722d0f914760dea8693c98 (diff)
parent2c084fc24ac6a8b875e7e57a605a4b06cc814f36 (diff)
downloadscilab-b1a5f0adddcb10e6baafc03627777c14f15c1461.zip
scilab-b1a5f0adddcb10e6baafc03627777c14f15c1461.tar.gz
Merge remote branch 'origin/master' into editvar
Conflicts: scilab/Scilab.sln scilab/Scilab_f2c.sln scilab/configure scilab/modules/Makefile.in Change-Id: I962c3ee191dd9207b4d3afa11dc9aa3dd60a014f
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 336eae9..b4d1578 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -80,6 +80,7 @@ simulated_annealing \
80parameters \ 80parameters \
81matio \ 81matio \
82atoms \ 82atoms \
83types \
83hdf5 \ 84hdf5 \
84graph\ 85graph\
85xcos \ 86xcos \
@@ -130,6 +131,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
130 $(top_builddir)/modules/graphics/libscigraphics.la \ 131 $(top_builddir)/modules/graphics/libscigraphics.la \
131 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \ 132 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
132 $(top_builddir)/modules/console/libsciconsole.la \ 133 $(top_builddir)/modules/console/libsciconsole.la \
134 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
133 $(top_builddir)/modules/jvm/libscijvm.la \ 135 $(top_builddir)/modules/jvm/libscijvm.la \
134 $(top_builddir)/modules/xcos/libscixcos.la \ 136 $(top_builddir)/modules/xcos/libscixcos.la \
135 $(top_builddir)/modules/xpad/libscixpad.la \ 137 $(top_builddir)/modules/xpad/libscixpad.la \
@@ -155,6 +157,7 @@ NO_GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la
155endif 157endif
156ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ 158ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
157 $(top_builddir)/modules/mexlib/libmex.la \ 159 $(top_builddir)/modules/mexlib/libmex.la \
160 $(top_builddir)/modules/parameters/libsciparameters.la \
158 $(top_builddir)/modules/boolean/libsciboolean.la \ 161 $(top_builddir)/modules/boolean/libsciboolean.la \
159 $(top_builddir)/modules/cacsd/libscicacsd.la \ 162 $(top_builddir)/modules/cacsd/libscicacsd.la \
160 $(top_builddir)/modules/core/libscicore.la \ 163 $(top_builddir)/modules/core/libscicore.la \
@@ -180,7 +183,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
180 $(top_builddir)/modules/shell/libscishell.la \ 183 $(top_builddir)/modules/shell/libscishell.la \
181 $(top_builddir)/modules/completion/libscicompletion.la \ 184 $(top_builddir)/modules/completion/libscicompletion.la \
182 $(top_builddir)/modules/history_manager/libscihistory_manager.la \ 185 $(top_builddir)/modules/history_manager/libscihistory_manager.la \
183 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
184 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 186 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
185 $(top_builddir)/modules/string/libscistring.la \ 187 $(top_builddir)/modules/string/libscistring.la \
186 $(top_builddir)/modules/fftw/libscifftw.la \ 188 $(top_builddir)/modules/fftw/libscifftw.la \