diff options
-rw-r--r-- | scilab/modules/Makefile.am | 15 | ||||
-rw-r--r-- | scilab/modules/Makefile.in | 25 |
2 files changed, 22 insertions, 18 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 \ |
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in index 8e403a0..3ac90b9 100644 --- a/scilab/modules/Makefile.in +++ b/scilab/modules/Makefile.in | |||
@@ -59,9 +59,11 @@ host_triplet = @host@ | |||
59 | # javasci should be compile at the end because it needs libscilab.la | 59 | # javasci should be compile at the end because it needs libscilab.la |
60 | # Don't forget that the order in subdirs does matter !!! | 60 | # Don't forget that the order in subdirs does matter !!! |
61 | @JAVASCI_TRUE@am__append_2 = javasci | 61 | @JAVASCI_TRUE@am__append_2 = javasci |
62 | @GUI_TRUE@am__append_3 = $(GUI_LIBS) | 62 | @HDF5_TRUE@am__append_3 = $(top_builddir)/modules/hdf5/libscihdf5-forceload.la |
63 | @GUI_FALSE@am__append_4 = $(NO_GUI_LIBS) | 63 | @HDF5_TRUE@am__append_4 = $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la |
64 | @ENABLE_STATIC_TRUE@am__append_5 = $(ALL_LIBS) | 64 | @GUI_TRUE@am__append_5 = $(GUI_LIBS) |
65 | @GUI_FALSE@am__append_6 = $(NO_GUI_LIBS) | ||
66 | @ENABLE_STATIC_TRUE@am__append_7 = $(ALL_LIBS) | ||
65 | subdir = modules | 67 | subdir = modules |
66 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 68 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
67 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 69 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
@@ -116,7 +118,7 @@ libscilab_cli_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | |||
116 | $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) -o $@ | 118 | $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) -o $@ |
117 | am__DEPENDENCIES_1 = | 119 | am__DEPENDENCIES_1 = |
118 | libscilab_la_DEPENDENCIES = $(ENGINE_LIBS) $(EXTERNAL_LIBS) \ | 120 | libscilab_la_DEPENDENCIES = $(ENGINE_LIBS) $(EXTERNAL_LIBS) \ |
119 | $(am__append_3) $(am__append_4) $(am__DEPENDENCIES_1) | 121 | $(am__append_5) $(am__append_6) $(am__DEPENDENCIES_1) |
120 | am_libscilab_la_OBJECTS = | 122 | am_libscilab_la_OBJECTS = |
121 | libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS) | 123 | libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS) |
122 | libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | 124 | libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
@@ -460,10 +462,8 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \ | |||
460 | $(top_builddir)/modules/console/libsciconsole.la \ | 462 | $(top_builddir)/modules/console/libsciconsole.la \ |
461 | $(top_builddir)/modules/jvm/libscijvm.la \ | 463 | $(top_builddir)/modules/jvm/libscijvm.la \ |
462 | $(top_builddir)/modules/xcos/libscixcos.la \ | 464 | $(top_builddir)/modules/xcos/libscixcos.la \ |
463 | $(top_builddir)/modules/xpad/libscixpad.la \ | 465 | $(top_builddir)/modules/xpad/libscixpad.la $(am__append_3) |
464 | $(top_builddir)/modules/hdf5/libscihdf5-forceload.la | 466 | # HDF5 is here because it needs the JVM (see bug #5481) |
465 | |||
466 | # HDF5 is here because it needs the JVM (see bug TODO) | ||
467 | NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ | 467 | NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ |
468 | $(top_builddir)/modules/renderer/libscirenderer-disable.la \ | 468 | $(top_builddir)/modules/renderer/libscirenderer-disable.la \ |
469 | $(top_builddir)/modules/graphics/libscigraphics-disable.la \ | 469 | $(top_builddir)/modules/graphics/libscigraphics-disable.la \ |
@@ -471,9 +471,9 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ | |||
471 | $(top_builddir)/modules/console/libsciconsole-disable.la \ | 471 | $(top_builddir)/modules/console/libsciconsole-disable.la \ |
472 | $(top_builddir)/modules/jvm/libscijvm-disable.la \ | 472 | $(top_builddir)/modules/jvm/libscijvm-disable.la \ |
473 | $(top_builddir)/modules/xcos/libscixcos-disable.la \ | 473 | $(top_builddir)/modules/xcos/libscixcos-disable.la \ |
474 | $(top_builddir)/modules/xpad/libscixpad-disable.la | 474 | $(top_builddir)/modules/xpad/libscixpad-disable.la \ |
475 | 475 | $(am__append_4) | |
476 | # HDF5 is here because it needs the JVM (see bug TODO) | 476 | # HDF5 is here because it needs the JVM (see bug #5481) |
477 | ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ | 477 | ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ |
478 | $(top_builddir)/modules/mexlib/libmex.la \ | 478 | $(top_builddir)/modules/mexlib/libmex.la \ |
479 | $(top_builddir)/modules/boolean/libsciboolean.la \ | 479 | $(top_builddir)/modules/boolean/libsciboolean.la \ |
@@ -530,7 +530,7 @@ ENGINE_LIBS_DYNAMIC_LOAD = \ | |||
530 | 530 | ||
531 | # Core modules | 531 | # Core modules |
532 | libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) \ | 532 | libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) \ |
533 | $(am__append_3) $(am__append_4) $(am__append_5) | 533 | $(am__append_5) $(am__append_6) $(am__append_7) |
534 | 534 | ||
535 | # Core modules | 535 | # Core modules |
536 | libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) | 536 | libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) |
@@ -929,7 +929,6 @@ uninstall-am: uninstall-pkglibLTLIBRARIES | |||
929 | tags tags-recursive uninstall uninstall-am \ | 929 | tags tags-recursive uninstall uninstall-am \ |
930 | uninstall-pkglibLTLIBRARIES | 930 | uninstall-pkglibLTLIBRARIES |
931 | 931 | ||
932 | $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la | ||
933 | 932 | ||
934 | #if MPI | 933 | #if MPI |
935 | #libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la | 934 | #libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la |