summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-07-10 15:17:33 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-07-10 15:17:33 +0200
commit8d3a3202f4961882c8e0ce7252c8ff6aceaf7eff (patch)
tree0ed5fb2c70aadd293ced9d09b2c63cd3e6518783 /scilab/modules/Makefile.am
parent39e73b6a8e7e63e2e57e6626a0baeb12c9418d11 (diff)
parent2b15f1263f51c0d9e872e484b2ecc37cd70faa38 (diff)
downloadscilab-8d3a3202f4961882c8e0ce7252c8ff6aceaf7eff.zip
scilab-8d3a3202f4961882c8e0ce7252c8ff6aceaf7eff.tar.gz
Merge commit 'origin/master' into atoms
Conflicts: scilab/configure scilab/etc/modules.xml.vc scilab/modules/Makefile.in
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 3d37140..80ce748 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -22,6 +22,7 @@ action_binding \
22arnoldi \ 22arnoldi \
23elementary_functions \ 23elementary_functions \
24string \ 24string \
25api_scilab \
25dynamic_link \ 26dynamic_link \
26fileio \ 27fileio \
27history_manager \ 28history_manager \
@@ -70,7 +71,6 @@ maple2scilab \
70m2sci \ 71m2sci \
71texmacs \ 72texmacs \
72scipad \ 73scipad \
73scilab2fortran \
74development_tools \ 74development_tools \
75compatibility_functions \ 75compatibility_functions \
76helptools \ 76helptools \
@@ -141,6 +141,7 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
141 $(top_builddir)/modules/cacsd/libscicacsd.la \ 141 $(top_builddir)/modules/cacsd/libscicacsd.la \
142 $(top_builddir)/modules/core/libscicore.la \ 142 $(top_builddir)/modules/core/libscicore.la \
143 $(top_builddir)/modules/call_scilab/libscicall_scilab.la \ 143 $(top_builddir)/modules/call_scilab/libscicall_scilab.la \
144 $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
144 $(top_builddir)/modules/data_structures/libscidata_structures.la \ 145 $(top_builddir)/modules/data_structures/libscidata_structures.la \
145 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ 146 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
146 $(top_builddir)/modules/double/libscidouble.la \ 147 $(top_builddir)/modules/double/libscidouble.la \