Allow ./configure --without-gui --without-javasci --without-jdk --disable-build-help... 94/1894/2
Bruno JOFRET [Mon, 13 Sep 2010 08:29:27 +0000 (10:29 +0200)]
to build minimal Scilab

Change-Id: I378ab55ce9443e564404cb250d4c8fb028413203

scilab/modules/Makefile.am
scilab/modules/Makefile.in

index 62affce..c5c0f37 100644 (file)
@@ -139,7 +139,8 @@ GUI_LIBS =  $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/xcos/libscixcos.la \
        $(top_builddir)/modules/scinotes/libsciscinotes.la \
        $(top_builddir)/modules/ui_data/libsciui_data.la \
-       $(top_builddir)/modules/history_browser/libscihistory_browser.la
+       $(top_builddir)/modules/history_browser/libscihistory_browser.la \
+       $(top_builddir)/modules/commons/libscicommons.la
 
 if HDF5
 GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload.la
@@ -155,8 +156,8 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/xcos/libscixcos-disable.la \
        $(top_builddir)/modules/scinotes/libsciscinotes-disable.la \
        $(top_builddir)/modules/ui_data/libsciui_data-disable.la \
-       $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la
-
+       $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la \
+       $(top_builddir)/modules/commons/libscicommons-disable.la
 
 if HDF5
 NO_GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la
@@ -195,8 +196,7 @@ ENGINE_LIBS =       $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
        $(top_builddir)/modules/functions/libscifunctions.la \
-       $(top_builddir)/modules/parallel/libsciparallel.la \
-       $(top_builddir)/modules/commons/libscicommons.la
+       $(top_builddir)/modules/parallel/libsciparallel.la
 
 
 # These libraries are loaded dynamically from Scilab.
index 0fedd06..afff9bd 100644 (file)
@@ -480,6 +480,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/scinotes/libsciscinotes.la \
        $(top_builddir)/modules/ui_data/libsciui_data.la \
        $(top_builddir)/modules/history_browser/libscihistory_browser.la \
+       $(top_builddir)/modules/commons/libscicommons.la \
        $(am__append_3)
 # HDF5 is here because it needs the JVM (see bug #5481)
 NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
@@ -492,6 +493,7 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/scinotes/libsciscinotes-disable.la \
        $(top_builddir)/modules/ui_data/libsciui_data-disable.la \
        $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la \
+       $(top_builddir)/modules/commons/libscicommons-disable.la \
        $(am__append_4)
 # HDF5 is here because it needs the JVM (see bug #5481)
 ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
@@ -527,8 +529,7 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
        $(top_builddir)/modules/functions/libscifunctions.la \
-       $(top_builddir)/modules/parallel/libsciparallel.la \
-       $(top_builddir)/modules/commons/libscicommons.la
+       $(top_builddir)/modules/parallel/libsciparallel.la
 
 
 # These libraries are loaded dynamically from Scilab.