summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2008-02-01 16:30:43 +0000
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2008-02-01 16:30:43 +0000
commit6d692eb953af5ba0eda68df3881310593cfddc1a (patch)
tree77258194f2a5d432a6823ea9ea65f7c676aaeeb8 /scilab/modules/Makefile.am
parent01a99bb006f1657cac7bd882bca98c89536f6cd8 (diff)
downloadscilab-6d692eb953af5ba0eda68df3881310593cfddc1a.zip
scilab-6d692eb953af5ba0eda68df3881310593cfddc1a.tar.gz
If the user doen't want to compile scicos
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am9
1 files changed, 7 insertions, 2 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 9877fa4..c417c6a 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -62,8 +62,6 @@ scilab2fortran \
62development_tools \ 62development_tools \
63compatibility_functions \ 63compatibility_functions \
64helptools \ 64helptools \
65scicos_blocks \
66scicos \
67fftw \ 65fftw \
68pvm \ 66pvm \
69spreadsheet \ 67spreadsheet \
@@ -74,6 +72,11 @@ demo_tools
74#SUBDIRS += mpi 72#SUBDIRS += mpi
75#endif 73#endif
76 74
75if SCICOS
76SUBDIRS += scicos_blocks \
77scicos
78endif
79
77SUBDIRS += . 80SUBDIRS += .
78 81
79# javasci should be compile at the end because it needs libscilab.la 82# javasci should be compile at the end because it needs libscilab.la
@@ -165,7 +168,9 @@ endif
165libscilab_la_LIBADD += $(top_builddir)/modules/jvm/libscijvm.la 168libscilab_la_LIBADD += $(top_builddir)/modules/jvm/libscijvm.la
166 169
167libscilab_la_LIBADD += $(top_builddir)/modules/scicos/libsciscicos.la 170libscilab_la_LIBADD += $(top_builddir)/modules/scicos/libsciscicos.la
171if SCICOS
168libscilab_la_LIBADD += $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la 172libscilab_la_LIBADD += $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
173endif
169 174
170## Libs 175## Libs
171libscilab_la_LIBADD += \ 176libscilab_la_LIBADD += \