summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-03-08 22:36:53 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-03-08 22:36:53 +0100
commitf967697a41575cd946419cc45bff2da5f72830a6 (patch)
treea389e78e0a2ec8ff1a1c263a0da572501a794690 /scilab/modules/Makefile.am
parent006335d6c998c8fc04849a804e3dc0f835f24b85 (diff)
parent222c3fc162897aa15eaa9f1b67bb81087b40570e (diff)
downloadscilab-f967697a41575cd946419cc45bff2da5f72830a6.zip
scilab-f967697a41575cd946419cc45bff2da5f72830a6.tar.gz
Merge commit 'refs/remotes/origin/5.1' into atoms
Conflicts: scilab/Version.incl scilab/configure scilab/modules/Makefile.in scilab/modules/core/includes/version.h
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index aabe43d..bcfb844 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -50,6 +50,7 @@ intersci \
50metanet \ 50metanet \
51signal_processing \ 51signal_processing \
52core \ 52core \
53call_scilab \
53interpolation \ 54interpolation \
54sound \ 55sound \
55time \ 56time \
@@ -117,6 +118,7 @@ $(top_builddir)/modules/mexlib/libmex.la \
117 $(top_builddir)/modules/boolean/libsciboolean.la \ 118 $(top_builddir)/modules/boolean/libsciboolean.la \
118 $(top_builddir)/modules/cacsd/libscicacsd.la \ 119 $(top_builddir)/modules/cacsd/libscicacsd.la \
119 $(top_builddir)/modules/core/libscicore.la \ 120 $(top_builddir)/modules/core/libscicore.la \
121 $(top_builddir)/modules/call_scilab/libscicall_scilab.la \
120 $(top_builddir)/modules/data_structures/libscidata_structures.la \ 122 $(top_builddir)/modules/data_structures/libscidata_structures.la \
121 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ 123 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
122 $(top_builddir)/modules/double/libscidouble.la \ 124 $(top_builddir)/modules/double/libscidouble.la \