summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorPierre Marechal <pierre.marechal@scilab.org>2008-02-04 15:19:54 +0000
committerPierre Marechal <pierre.marechal@scilab.org>2008-02-04 15:19:54 +0000
commit8e738ae7e5c2555da824e033efcbed0e5588e909 (patch)
treea686efa89f3288a60c400b0c8bc8068bc50687fb /scilab/modules/Makefile.am
parent92fb39fbef3f8a2c0d452d267384a8e1c9787aea (diff)
downloadscilab-8e738ae7e5c2555da824e033efcbed0e5588e909.zip
scilab-8e738ae7e5c2555da824e033efcbed0e5588e909.tar.gz
STRING_V2 => string
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am11
1 files changed, 1 insertions, 10 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 3d3186f..58da2c7 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -6,12 +6,8 @@
6# The order DOES matter !!! 6# The order DOES matter !!!
7SUBDIRS = polynomials 7SUBDIRS = polynomials
8 8
9if STRING_V1
10SUBDIRS += string
11endif
12
13SUBDIRS += \ 9SUBDIRS += \
14STRING_V2 \ 10string \
15intersci \ 11intersci \
16cacsd \ 12cacsd \
17elementary_functions \ 13elementary_functions \
@@ -151,12 +147,7 @@ libscilab_la_LIBADD = \
151 $(top_builddir)/modules/output_stream/libscioutput_stream.la 147 $(top_builddir)/modules/output_stream/libscioutput_stream.la
152 148
153# Temp stuff 149# Temp stuff
154if STRING_V1
155libscilab_la_LIBADD += $(top_builddir)/modules/string/libscistring.la 150libscilab_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
156else
157libscilab_la_LIBADD += $(top_builddir)/modules/STRING_V2/libscistring.la
158endif
159
160 151
161#if MPI 152#if MPI
162#libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la 153#libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la