summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-12-14 00:31:35 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-12-14 00:31:35 +0100
commit58ca873b406c24932c69060842f3810d34e726ce (patch)
treeeaf8f17e915c1e1c3034a9d9a05cb21fcdf91385 /scilab/modules/Makefile.am
parent0658d20c1be1516d09c9ad6db41765669df20986 (diff)
downloadscilab-58ca873b406c24932c69060842f3810d34e726ce.zip
scilab-58ca873b406c24932c69060842f3810d34e726ce.tar.gz
Better management of the library changes of bug #5481
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am11
1 files changed, 7 insertions, 4 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index caf32d4..010930f 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -129,8 +129,9 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
129 $(top_builddir)/modules/console/libsciconsole.la \ 129 $(top_builddir)/modules/console/libsciconsole.la \
130 $(top_builddir)/modules/jvm/libscijvm.la \ 130 $(top_builddir)/modules/jvm/libscijvm.la \
131 $(top_builddir)/modules/xcos/libscixcos.la \ 131 $(top_builddir)/modules/xcos/libscixcos.la \
132 $(top_builddir)/modules/xpad/libscixpad.la 132 $(top_builddir)/modules/xpad/libscixpad.la \
133 133 $(top_builddir)/modules/hdf5/libscihdf5-forceload.la
134# HDF5 is here because it needs the JVM (see bug TODO)
134 135
135NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ 136NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
136 $(top_builddir)/modules/renderer/libscirenderer-disable.la \ 137 $(top_builddir)/modules/renderer/libscirenderer-disable.la \
@@ -140,6 +141,8 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
140 $(top_builddir)/modules/jvm/libscijvm-disable.la \ 141 $(top_builddir)/modules/jvm/libscijvm-disable.la \
141 $(top_builddir)/modules/xcos/libscixcos-disable.la \ 142 $(top_builddir)/modules/xcos/libscixcos-disable.la \
142 $(top_builddir)/modules/xpad/libscixpad-disable.la 143 $(top_builddir)/modules/xpad/libscixpad-disable.la
144 $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la
145# HDF5 is here because it needs the JVM (see bug TODO)
143 146
144ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ 147ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
145 $(top_builddir)/modules/mexlib/libmex.la \ 148 $(top_builddir)/modules/mexlib/libmex.la \
@@ -172,8 +175,8 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
172 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 175 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
173 $(top_builddir)/modules/string/libscistring.la \ 176 $(top_builddir)/modules/string/libscistring.la \
174 $(top_builddir)/modules/fftw/libscifftw.la \ 177 $(top_builddir)/modules/fftw/libscifftw.la \
175 $(top_builddir)/modules/functions/libscifunctions.la \ 178 $(top_builddir)/modules/hdf5/libscihdf5.la \
176 $(top_builddir)/modules/hdf5/libscihdf5.la 179 $(top_builddir)/modules/functions/libscifunctions.la
177 180
178 181
179# These libraries are loaded dynamically from Scilab. 182# These libraries are loaded dynamically from Scilab.