summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-03-05 14:08:14 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-03-05 14:08:14 +0100
commit3bc33dfbc8b0f25d45a0baa901fa2ad588129bd3 (patch)
tree04a1512e46e82400af93af089077a6611c711773 /scilab/modules/Makefile.am
parentc9eb13b2d82642d45dabbe7173188de3cd3b6950 (diff)
parentdebd95622b11dc06f057e9c97d2651308b102427 (diff)
downloadscilab-3bc33dfbc8b0f25d45a0baa901fa2ad588129bd3.zip
scilab-3bc33dfbc8b0f25d45a0baa901fa2ad588129bd3.tar.gz
merge with master (to do: update makefiles)
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index a04f07b..336eae9 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -81,10 +81,12 @@ parameters \
81matio \ 81matio \
82atoms \ 82atoms \
83hdf5 \ 83hdf5 \
84graph\
84xcos \ 85xcos \
85xpad \ 86xpad \
86ui_data 87ui_data
87 88
89
88#umfpack 90#umfpack
89 91
90#if MPI 92#if MPI
@@ -139,7 +141,6 @@ GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload.la
139endif 141endif
140 142
141NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ 143NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
142 $(top_builddir)/modules/renderer/libscirenderer-disable.la \
143 $(top_builddir)/modules/graphics/libscigraphics-disable.la \ 144 $(top_builddir)/modules/graphics/libscigraphics-disable.la \
144 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ 145 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
145 $(top_builddir)/modules/console/libsciconsole-disable.la \ 146 $(top_builddir)/modules/console/libsciconsole-disable.la \