summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorVincent Couvert <vincent.couvert@scilab.org>2008-07-28 16:05:58 +0000
committerVincent Couvert <vincent.couvert@scilab.org>2008-07-28 16:05:58 +0000
commit8ca75f6de584aeb281854ca02ea36ca33fe87820 (patch)
treeca745a514eaefb9a155ec20dddee29eaf16a9d3b /scilab
parent1f508d5cff999f03d38f644a15ef2a72b97c2eff (diff)
downloadscilab-8ca75f6de584aeb281854ca02ea36ca33fe87820.zip
scilab-8ca75f6de584aeb281854ca02ea36ca33fe87820.tar.gz
Change compilation order
Diffstat (limited to 'scilab')
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in4
-rw-r--r--scilab/modules/graphic_export/Makefile.am2
-rw-r--r--scilab/modules/graphic_export/Makefile.in6
4 files changed, 6 insertions, 8 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 911d680..2f2c6f8 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -25,10 +25,10 @@ shell \
25completion \ 25completion \
26localization \ 26localization \
27console \ 27console \
28graphic_export \
28gui \ 29gui \
29jvm \ 30jvm \
30graphics \ 31graphics \
31graphic_export \
32optimization \ 32optimization \
33symbolic \ 33symbolic \
34randlib \ 34randlib \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 6171247..84c36e2 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -129,7 +129,7 @@ CTAGS = ctags
129DIST_SUBDIRS = core output_stream action_binding arnoldi \ 129DIST_SUBDIRS = core output_stream action_binding arnoldi \
130 elementary_functions string dynamic_link history_manager \ 130 elementary_functions string dynamic_link history_manager \
131 fileio spreadsheet tclsci renderer shell completion \ 131 fileio spreadsheet tclsci renderer shell completion \
132 localization console gui jvm graphics graphic_export \ 132 localization console graphic_export gui jvm graphics \
133 optimization symbolic randlib statistics special_functions \ 133 optimization symbolic randlib statistics special_functions \
134 interpolation linear_algebra integer data_structures mexlib \ 134 interpolation linear_algebra integer data_structures mexlib \
135 differential_equations cacsd polynomials boolean double pvm io \ 135 differential_equations cacsd polynomials boolean double pvm io \
@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
332SUBDIRS = core output_stream action_binding arnoldi \ 332SUBDIRS = core output_stream action_binding arnoldi \
333 elementary_functions string dynamic_link history_manager \ 333 elementary_functions string dynamic_link history_manager \
334 fileio spreadsheet tclsci renderer shell completion \ 334 fileio spreadsheet tclsci renderer shell completion \
335 localization console gui jvm graphics graphic_export \ 335 localization console graphic_export gui jvm graphics \
336 optimization symbolic randlib statistics special_functions \ 336 optimization symbolic randlib statistics special_functions \
337 interpolation linear_algebra integer data_structures mexlib \ 337 interpolation linear_algebra integer data_structures mexlib \
338 differential_equations cacsd polynomials boolean double pvm io \ 338 differential_equations cacsd polynomials boolean double pvm io \
diff --git a/scilab/modules/graphic_export/Makefile.am b/scilab/modules/graphic_export/Makefile.am
index b4ca3bd..74cb685 100644
--- a/scilab/modules/graphic_export/Makefile.am
+++ b/scilab/modules/graphic_export/Makefile.am
@@ -50,7 +50,7 @@ libscigraphic_export_la_SOURCES = $(GRAPHIC_EXPORT_C_SOURCES) $(GATEWAY_C_SOURCE
50 50
51## Libraries necessary 51## Libraries necessary
52## Change to include other Scilab modules/lib 52## Change to include other Scilab modules/lib
53libscigraphic_export_la_LIBADD = $(top_builddir)/modules/jvm/libscijvm.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/graphics/libscigraphics.la 53libscigraphic_export_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
54 54
55GIWS_WRAPPERS= src/jni/FileExporter.giws.xml \ 55GIWS_WRAPPERS= src/jni/FileExporter.giws.xml \
56src/jni/GL2PSToJOGL.giws.xml \ 56src/jni/GL2PSToJOGL.giws.xml \
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index acab33f..e942d37 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -95,10 +95,8 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
95pkglibLTLIBRARIES_INSTALL = $(INSTALL) 95pkglibLTLIBRARIES_INSTALL = $(INSTALL)
96LTLIBRARIES = $(pkglib_LTLIBRARIES) 96LTLIBRARIES = $(pkglib_LTLIBRARIES)
97@GUI_TRUE@libscigraphic_export_la_DEPENDENCIES = \ 97@GUI_TRUE@libscigraphic_export_la_DEPENDENCIES = \
98@GUI_TRUE@ $(top_builddir)/modules/jvm/libscijvm.la \
99@GUI_TRUE@ $(top_builddir)/modules/core/libscicore.la \ 98@GUI_TRUE@ $(top_builddir)/modules/core/libscicore.la \
100@GUI_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 99@GUI_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la
101@GUI_TRUE@ $(top_builddir)/modules/graphics/libscigraphics.la
102am__libscigraphic_export_la_SOURCES_DIST = \ 100am__libscigraphic_export_la_SOURCES_DIST = \
103 src/nographic_export/nographic_export.c src/c/xs2file.c \ 101 src/nographic_export/nographic_export.c src/c/xs2file.c \
104 src/jni/GL2PSConstant_wrap.c src/jni/GL2PSWrapping_wrap.c \ 102 src/jni/GL2PSConstant_wrap.c src/jni/GL2PSWrapping_wrap.c \
@@ -411,7 +409,7 @@ top_srcdir = @top_srcdir@
411 409
412# All the sources needed by libscigraphic_export.la 410# All the sources needed by libscigraphic_export.la
413@GUI_TRUE@libscigraphic_export_la_SOURCES = $(GRAPHIC_EXPORT_C_SOURCES) $(GATEWAY_C_SOURCES) $(GRAPHIC_EXPORT_CPP_SOURCES) 411@GUI_TRUE@libscigraphic_export_la_SOURCES = $(GRAPHIC_EXPORT_C_SOURCES) $(GATEWAY_C_SOURCES) $(GRAPHIC_EXPORT_CPP_SOURCES)
414@GUI_TRUE@libscigraphic_export_la_LIBADD = $(top_builddir)/modules/jvm/libscijvm.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/graphics/libscigraphics.la 412@GUI_TRUE@libscigraphic_export_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
415@GUI_TRUE@GIWS_WRAPPERS = src/jni/FileExporter.giws.xml \ 413@GUI_TRUE@GIWS_WRAPPERS = src/jni/FileExporter.giws.xml \
416@GUI_TRUE@src/jni/GL2PSToJOGL.giws.xml \ 414@GUI_TRUE@src/jni/GL2PSToJOGL.giws.xml \
417@GUI_TRUE@src/jni/JOGLConstant.giws.xml 415@GUI_TRUE@src/jni/JOGLConstant.giws.xml