summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2008-04-29 11:59:27 +0000
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2008-04-29 11:59:27 +0000
commitb58762ab12e840606832dd072abf5679e3f6a356 (patch)
tree4b72e07bea28b6623aeb1037b1fe9faa4c1e227f /scilab/modules/Makefile.am
parent23991ab8eb2a8601d9b136d35f8a46b126af4c1b (diff)
downloadscilab-b58762ab12e840606832dd072abf5679e3f6a356.zip
scilab-b58762ab12e840606832dd072abf5679e3f6a356.tar.gz
Beginning of the management of a static compilation which will probably never work because of Java suckzz for this... Only in nwni
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am13
1 files changed, 10 insertions, 3 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 186ed09..44e6087 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -112,9 +112,8 @@ if ! USE_EMBEDDED_BLAS
112libscilab_la_LDFLAGS += $(BLAS_LIBS) 112libscilab_la_LDFLAGS += $(BLAS_LIBS)
113endif 113endif
114 114
115# Core modules 115ALL_LIBS= $(top_builddir)/modules/fileio/libscifileio.la \
116libscilab_la_LIBADD = \ 116$(top_builddir)/modules/mexlib/libmex.la \
117 $(top_builddir)/modules/mexlib/libmex.la \
118 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 117 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
119 $(top_builddir)/modules/boolean/libsciboolean.la \ 118 $(top_builddir)/modules/boolean/libsciboolean.la \
120 $(top_builddir)/modules/cacsd/libscicacsd.la \ 119 $(top_builddir)/modules/cacsd/libscicacsd.la \
@@ -158,6 +157,14 @@ libscilab_la_LIBADD = \
158 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 157 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
159 $(top_builddir)/modules/matio/libscimatio.la 158 $(top_builddir)/modules/matio/libscimatio.la
160 159
160
161# Core modules
162libscilab_la_LIBADD = $(ALL_LIBS)
163
164if ENABLE_STATIC
165libscilab_la_LIBADD += $(ALL_LIBS)
166
167endif
161# Temp stuff 168# Temp stuff
162libscilab_la_LIBADD += $(top_builddir)/modules/string/libscistring.la 169libscilab_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
163 170