summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2010-01-11 15:44:37 +0100
committerClément DAVID <clement.david@scilab.org>2010-01-11 15:44:37 +0100
commit17fc60da69a28b1e3308eda37b88fe4369ab47b8 (patch)
treec3e1b413ca646dfdcdda37d67edde7c005ebcaa3 /scilab/modules/shell
parent656ccf4831fd9118a7d776b4656360911b79e9d1 (diff)
parent40b6f715014f3dc2efc4e55b3f15adcf4523324b (diff)
downloadscilab-17fc60da69a28b1e3308eda37b88fe4369ab47b8.zip
scilab-17fc60da69a28b1e3308eda37b88fe4369ab47b8.tar.gz
Merge branch '5.2'
Diffstat (limited to 'scilab/modules/shell')
-rw-r--r--scilab/modules/shell/Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index b952ab8..7d3300d 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -68,7 +68,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
71 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 71 $(top_srcdir)/m4/intel_compiler.m4 \
72 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
72 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 73 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
73 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 74 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
74 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 75 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \