diff options
author | Sylvestre Ledru <sylvestre.ledru@scilab.org> | 2008-02-01 16:30:43 +0000 |
---|---|---|
committer | Sylvestre Ledru <sylvestre.ledru@scilab.org> | 2008-02-01 16:30:43 +0000 |
commit | 6d692eb953af5ba0eda68df3881310593cfddc1a (patch) | |
tree | 77258194f2a5d432a6823ea9ea65f7c676aaeeb8 /scilab/modules/Makefile.am | |
parent | 01a99bb006f1657cac7bd882bca98c89536f6cd8 (diff) | |
download | scilab-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.am | 9 |
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 \ | |||
62 | development_tools \ | 62 | development_tools \ |
63 | compatibility_functions \ | 63 | compatibility_functions \ |
64 | helptools \ | 64 | helptools \ |
65 | scicos_blocks \ | ||
66 | scicos \ | ||
67 | fftw \ | 65 | fftw \ |
68 | pvm \ | 66 | pvm \ |
69 | spreadsheet \ | 67 | spreadsheet \ |
@@ -74,6 +72,11 @@ demo_tools | |||
74 | #SUBDIRS += mpi | 72 | #SUBDIRS += mpi |
75 | #endif | 73 | #endif |
76 | 74 | ||
75 | if SCICOS | ||
76 | SUBDIRS += scicos_blocks \ | ||
77 | scicos | ||
78 | endif | ||
79 | |||
77 | SUBDIRS += . | 80 | SUBDIRS += . |
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 | |||
165 | libscilab_la_LIBADD += $(top_builddir)/modules/jvm/libscijvm.la | 168 | libscilab_la_LIBADD += $(top_builddir)/modules/jvm/libscijvm.la |
166 | 169 | ||
167 | libscilab_la_LIBADD += $(top_builddir)/modules/scicos/libsciscicos.la | 170 | libscilab_la_LIBADD += $(top_builddir)/modules/scicos/libsciscicos.la |
171 | if SCICOS | ||
168 | libscilab_la_LIBADD += $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la | 172 | libscilab_la_LIBADD += $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la |
173 | endif | ||
169 | 174 | ||
170 | ## Libs | 175 | ## Libs |
171 | libscilab_la_LIBADD += \ | 176 | libscilab_la_LIBADD += \ |