summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-12-15 16:06:40 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-12-15 16:06:40 +0100
commite4e6eb9712f5e8ecf87a164b2b3e280aa919dfb9 (patch)
tree98e326f9e2d8766f79bfddefeb7f902a783eb74c /scilab/modules/Makefile.am
parent404ad80f56d4f758748247f8ee4c5417ff964a1a (diff)
downloadscilab-e4e6eb9712f5e8ecf87a164b2b3e280aa919dfb9.zip
scilab-e4e6eb9712f5e8ecf87a164b2b3e280aa919dfb9.tar.gz
only link against these libraries when the hdf5 module is built
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am15
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) 134if HDF5
135GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload.la
136# HDF5 is here because it needs the JVM (see bug #5481)
137endif
135 138
136NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ 139NO_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
148if HDF5
149NO_GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la
150# HDF5 is here because it needs the JVM (see bug #5481)
151endif
147ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ 152ENGINE_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 \