diff options
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r-- | scilab/modules/Makefile.am | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am index 010930f..9e29984 100644 --- a/scilab/modules/Makefile.am +++ b/scilab/modules/Makefile.am | |||
@@ -129,9 +129,12 @@ 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 | $(top_builddir)/modules/hdf5/libscihdf5-forceload.la | 133 | |
134 | # HDF5 is here because it needs the JVM (see bug TODO) | 134 | if HDF5 |
135 | GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload.la | ||
136 | # HDF5 is here because it needs the JVM (see bug #5481) | ||
137 | endif | ||
135 | 138 | ||
136 | NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ | 139 | NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ |
137 | $(top_builddir)/modules/renderer/libscirenderer-disable.la \ | 140 | $(top_builddir)/modules/renderer/libscirenderer-disable.la \ |
@@ -141,9 +144,11 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ | |||
141 | $(top_builddir)/modules/jvm/libscijvm-disable.la \ | 144 | $(top_builddir)/modules/jvm/libscijvm-disable.la \ |
142 | $(top_builddir)/modules/xcos/libscixcos-disable.la \ | 145 | $(top_builddir)/modules/xcos/libscixcos-disable.la \ |
143 | $(top_builddir)/modules/xpad/libscixpad-disable.la | 146 | $(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) | ||
146 | 147 | ||
148 | if HDF5 | ||
149 | NO_GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la | ||
150 | # HDF5 is here because it needs the JVM (see bug #5481) | ||
151 | endif | ||
147 | ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ | 152 | ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ |
148 | $(top_builddir)/modules/mexlib/libmex.la \ | 153 | $(top_builddir)/modules/mexlib/libmex.la \ |
149 | $(top_builddir)/modules/boolean/libsciboolean.la \ | 154 | $(top_builddir)/modules/boolean/libsciboolean.la \ |