summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2009-09-11 08:22:37 +0200
committerBruno JOFRET <bruno.jofret@scilab.org>2009-09-11 08:22:37 +0200
commitbdca101a3eaf3dd4bf09168f3322e0b972b64f42 (patch)
treede3e7f81d8f9307b5c1d86d9efa1e71c26947d8f /scilab/modules/Makefile.am
parentb36c46678ffded314522c7df66a34ec2d80f2130 (diff)
parent1b61c11bb5b699077a5c5881891edc1b30afec4e (diff)
downloadscilab-bdca101a3eaf3dd4bf09168f3322e0b972b64f42.zip
scilab-bdca101a3eaf3dd4bf09168f3322e0b972b64f42.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/Scilab.sln scilab/Scilab_f2c.sln scilab/configure scilab/configure.ac scilab/etc/modules.xml.in scilab/etc/modules.xml.vc scilab/modules/Makefile.am scilab/modules/Makefile.in scilab/modules/core/includes/callinterf.h scilab/modules/core/src/c/callinterf.c scilab/modules/core/src/c/dynamic_gateways.c scilab/scilab-lib.properties.in scilab/scilab-lib.properties.vc
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am19
1 files changed, 17 insertions, 2 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index a6d7834..3d1f186 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -83,7 +83,8 @@ parameters \
83matio \ 83matio \
84atoms \ 84atoms \
85hdf5 \ 85hdf5 \
86xcos 86xcos \
87xpad
87 88
88#umfpack 89#umfpack
89 90
@@ -129,7 +130,11 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
129 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \ 130 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
130 $(top_builddir)/modules/console/libsciconsole.la \ 131 $(top_builddir)/modules/console/libsciconsole.la \
131 $(top_builddir)/modules/jvm/libscijvm.la \ 132 $(top_builddir)/modules/jvm/libscijvm.la \
133<<<<<<< HEAD:scilab/modules/Makefile.am
132 $(top_builddir)/modules/xcos/libscixcos.la 134 $(top_builddir)/modules/xcos/libscixcos.la
135=======
136 $(top_builddir)/modules/xpad/libscixpad.la
137>>>>>>> origin/master:scilab/modules/Makefile.am
133 138
134NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ 139NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
135 $(top_builddir)/modules/renderer/libscirenderer-disable.la \ 140 $(top_builddir)/modules/renderer/libscirenderer-disable.la \
@@ -137,7 +142,11 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
137 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ 142 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
138 $(top_builddir)/modules/console/libsciconsole-disable.la \ 143 $(top_builddir)/modules/console/libsciconsole-disable.la \
139 $(top_builddir)/modules/jvm/libscijvm-disable.la \ 144 $(top_builddir)/modules/jvm/libscijvm-disable.la \
145<<<<<<< HEAD:scilab/modules/Makefile.am
140 $(top_builddir)/modules/xcos/libscixcos-disable.la 146 $(top_builddir)/modules/xcos/libscixcos-disable.la
147=======
148 $(top_builddir)/modules/xpad/libscixpad-disable.la
149>>>>>>> origin/master:scilab/modules/Makefile.am
141 150
142ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ 151ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
143 $(top_builddir)/modules/mexlib/libmex.la \ 152 $(top_builddir)/modules/mexlib/libmex.la \
@@ -197,7 +206,13 @@ endif
197# Dev in progress 206# Dev in progress
198 207
199# Core modules 208# Core modules
200libscilab_la_LIBADD = $(ENGINE_LIBS) $(GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 209libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
210
211if GUI
212libscilab_la_LIBADD += $(GUI_LIBS)
213else
214libscilab_la_LIBADD += $(NO_GUI_LIBS)
215endif
201 216
202# Core modules 217# Core modules
203libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 218libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)