diff options
author | Bruno JOFRET <bruno.jofret@scilab.org> | 2010-05-21 10:32:49 +0200 |
---|---|---|
committer | Vincent COUVERT <vincent.couvert@scilab.org> | 2010-05-21 11:59:52 +0200 |
commit | c3be8852b0649f5ffff05947a062a3244fe41e92 (patch) | |
tree | 0340a8277b197d5a7449ba1b9adff47b561749aa /scilab/modules | |
parent | 1c8c296b2825367d8bce5033507983a72bf010a7 (diff) | |
download | scilab-c3be8852b0649f5ffff05947a062a3244fe41e92.zip scilab-c3be8852b0649f5ffff05947a062a3244fe41e92.tar.gz |
Fix dependencies :
* JAVA :
action_binding needs localization
jvm needs action_binding
gui needs action_binding
(jvm needs gui)
* C/C++ :
action_binding needs jvm => Cyclic dependancy explicitly removed
tclsci no more needs action_binding
console no more needs action_binding
shell no more needs action_binding
* scilab-cli :
linked against libsciaction_binding-disable.la
* scilab-adv-cli :
linked against libsciaction_binding.la
Change-Id: I361b2c7f292b7c75ed06e2549fafada50f8982af
Diffstat (limited to 'scilab/modules')
-rw-r--r-- | scilab/modules/Makefile.am | 3 | ||||
-rw-r--r-- | scilab/modules/Makefile.in | 25 | ||||
-rw-r--r-- | scilab/modules/action_binding/Makefile.am | 18 | ||||
-rw-r--r-- | scilab/modules/action_binding/Makefile.in | 67 | ||||
-rw-r--r-- | scilab/modules/action_binding/src/noaction_binding/noaction_binding.c | 18 | ||||
-rw-r--r-- | scilab/modules/console/Makefile.am | 4 | ||||
-rw-r--r-- | scilab/modules/console/Makefile.in | 7 | ||||
-rw-r--r-- | scilab/modules/shell/Makefile.am | 5 | ||||
-rw-r--r-- | scilab/modules/shell/Makefile.in | 9 | ||||
-rw-r--r-- | scilab/modules/tclsci/Makefile.am | 5 | ||||
-rw-r--r-- | scilab/modules/tclsci/Makefile.in | 8 |
11 files changed, 98 insertions, 71 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am index caa64ee..fbcc142 100644 --- a/scilab/modules/Makefile.am +++ b/scilab/modules/Makefile.am | |||
@@ -18,7 +18,6 @@ SUBDIRS = core | |||
18 | 18 | ||
19 | SUBDIRS += \ | 19 | SUBDIRS += \ |
20 | output_stream \ | 20 | output_stream \ |
21 | action_binding \ | ||
22 | arnoldi \ | 21 | arnoldi \ |
23 | elementary_functions \ | 22 | elementary_functions \ |
24 | string \ | 23 | string \ |
@@ -29,6 +28,7 @@ history_manager \ | |||
29 | spreadsheet \ | 28 | spreadsheet \ |
30 | tclsci \ | 29 | tclsci \ |
31 | localization \ | 30 | localization \ |
31 | action_binding \ | ||
32 | renderer \ | 32 | renderer \ |
33 | shell \ | 33 | shell \ |
34 | completion \ | 34 | completion \ |
@@ -143,6 +143,7 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ | |||
143 | $(top_builddir)/modules/graphics/libscigraphics-disable.la \ | 143 | $(top_builddir)/modules/graphics/libscigraphics-disable.la \ |
144 | $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ | 144 | $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ |
145 | $(top_builddir)/modules/console/libsciconsole-disable.la \ | 145 | $(top_builddir)/modules/console/libsciconsole-disable.la \ |
146 | $(top_builddir)/modules/action_binding/libsciaction_binding-disable.la \ | ||
146 | $(top_builddir)/modules/jvm/libscijvm-disable.la \ | 147 | $(top_builddir)/modules/jvm/libscijvm-disable.la \ |
147 | $(top_builddir)/modules/xcos/libscixcos-disable.la \ | 148 | $(top_builddir)/modules/xcos/libscixcos-disable.la \ |
148 | $(top_builddir)/modules/xpad/libscixpad-disable.la | 149 | $(top_builddir)/modules/xpad/libscixpad-disable.la |
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in index 4b00f79..bade7d9 100644 --- a/scilab/modules/Makefile.in +++ b/scilab/modules/Makefile.in | |||
@@ -151,12 +151,12 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | |||
151 | distdir | 151 | distdir |
152 | ETAGS = etags | 152 | ETAGS = etags |
153 | CTAGS = ctags | 153 | CTAGS = ctags |
154 | DIST_SUBDIRS = core output_stream action_binding arnoldi \ | 154 | DIST_SUBDIRS = core output_stream arnoldi elementary_functions string \ |
155 | elementary_functions string api_scilab dynamic_link fileio \ | 155 | api_scilab dynamic_link fileio history_manager spreadsheet \ |
156 | history_manager spreadsheet tclsci localization renderer shell \ | 156 | tclsci localization action_binding renderer shell completion \ |
157 | completion console graphic_export gui jvm graphics \ | 157 | console graphic_export gui jvm graphics optimization symbolic \ |
158 | optimization symbolic randlib statistics special_functions \ | 158 | randlib statistics special_functions interpolation \ |
159 | interpolation linear_algebra integer data_structures mexlib \ | 159 | linear_algebra integer data_structures mexlib \ |
160 | differential_equations cacsd polynomials boolean double pvm io \ | 160 | differential_equations cacsd polynomials boolean double pvm io \ |
161 | intersci signal_processing call_scilab sound time sparse \ | 161 | intersci signal_processing call_scilab sound time sparse \ |
162 | windows_tools functions overloading maple2scilab m2sci texmacs \ | 162 | windows_tools functions overloading maple2scilab m2sci texmacs \ |
@@ -433,12 +433,12 @@ top_srcdir = @top_srcdir@ | |||
433 | 433 | ||
434 | # core is the main module of Scilab. All the compilation deps has been removed | 434 | # core is the main module of Scilab. All the compilation deps has been removed |
435 | # since it already linked almost the whole world | 435 | # since it already linked almost the whole world |
436 | SUBDIRS = core output_stream action_binding arnoldi \ | 436 | SUBDIRS = core output_stream arnoldi elementary_functions string \ |
437 | elementary_functions string api_scilab dynamic_link fileio \ | 437 | api_scilab dynamic_link fileio history_manager spreadsheet \ |
438 | history_manager spreadsheet tclsci localization renderer shell \ | 438 | tclsci localization action_binding renderer shell completion \ |
439 | completion console graphic_export gui jvm graphics \ | 439 | console graphic_export gui jvm graphics optimization symbolic \ |
440 | optimization symbolic randlib statistics special_functions \ | 440 | randlib statistics special_functions interpolation \ |
441 | interpolation linear_algebra integer data_structures mexlib \ | 441 | linear_algebra integer data_structures mexlib \ |
442 | differential_equations cacsd polynomials boolean double pvm io \ | 442 | differential_equations cacsd polynomials boolean double pvm io \ |
443 | intersci signal_processing core call_scilab interpolation \ | 443 | intersci signal_processing core call_scilab interpolation \ |
444 | sound time randlib sparse windows_tools functions overloading \ | 444 | sound time randlib sparse windows_tools functions overloading \ |
@@ -477,6 +477,7 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ | |||
477 | $(top_builddir)/modules/graphics/libscigraphics-disable.la \ | 477 | $(top_builddir)/modules/graphics/libscigraphics-disable.la \ |
478 | $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ | 478 | $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ |
479 | $(top_builddir)/modules/console/libsciconsole-disable.la \ | 479 | $(top_builddir)/modules/console/libsciconsole-disable.la \ |
480 | $(top_builddir)/modules/action_binding/libsciaction_binding-disable.la \ | ||
480 | $(top_builddir)/modules/jvm/libscijvm-disable.la \ | 481 | $(top_builddir)/modules/jvm/libscijvm-disable.la \ |
481 | $(top_builddir)/modules/xcos/libscixcos-disable.la \ | 482 | $(top_builddir)/modules/xcos/libscixcos-disable.la \ |
482 | $(top_builddir)/modules/xpad/libscixpad-disable.la \ | 483 | $(top_builddir)/modules/xpad/libscixpad-disable.la \ |
diff --git a/scilab/modules/action_binding/Makefile.am b/scilab/modules/action_binding/Makefile.am index 9c45824..e1d089b 100644 --- a/scilab/modules/action_binding/Makefile.am +++ b/scilab/modules/action_binding/Makefile.am | |||
@@ -29,10 +29,6 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp | |||
29 | 29 | ||
30 | #### SWIG Declaration #### | 30 | #### SWIG Declaration #### |
31 | SWIG_WRAPPERS = src/jni/InterpreterManagement.i | 31 | SWIG_WRAPPERS = src/jni/InterpreterManagement.i |
32 | else | ||
33 | # List of the c files | ||
34 | ACTION_BINDING_C_SOURCES = src/noaction_binding/noaction_binding.c \ | ||
35 | src/c/dynamic_menus.c | ||
36 | endif | 32 | endif |
37 | 33 | ||
38 | if SWIG | 34 | if SWIG |
@@ -45,6 +41,9 @@ if GIWS | |||
45 | BUILT_SOURCES=giws | 41 | BUILT_SOURCES=giws |
46 | endif | 42 | endif |
47 | 43 | ||
44 | libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.c | ||
45 | libsciaction_binding_disable_la_CFLAGS = -I$(srcdir)/includes/ \ | ||
46 | -I$(top_srcdir)/modules/output_stream/includes | ||
48 | 47 | ||
49 | # Includes need for the compilation | 48 | # Includes need for the compilation |
50 | libsciaction_binding_la_CFLAGS= $(JAVA_JNI_INCLUDE) \ | 49 | libsciaction_binding_la_CFLAGS= $(JAVA_JNI_INCLUDE) \ |
@@ -68,7 +67,11 @@ libsciaction_binding_la_CPPFLAGS= $(JAVA_JNI_INCLUDE) \ | |||
68 | 67 | ||
69 | # Name of the future library (.la will be replace by .so, .a, etc regarding | 68 | # Name of the future library (.la will be replace by .so, .a, etc regarding |
70 | # the system) | 69 | # the system) |
71 | pkglib_LTLIBRARIES = libsciaction_binding.la | 70 | pkglib_LTLIBRARIES = libsciaction_binding-disable.la |
71 | |||
72 | if GUI | ||
73 | pkglib_LTLIBRARIES += libsciaction_binding.la | ||
74 | endif | ||
72 | 75 | ||
73 | libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS) | 76 | libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS) |
74 | 77 | ||
@@ -83,8 +86,11 @@ INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS) | |||
83 | ## Change to include other Scilab modules/lib | 86 | ## Change to include other Scilab modules/lib |
84 | libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \ | 87 | libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \ |
85 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ | 88 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ |
86 | $(top_builddir)/modules/jvm/libscijvm.la \ | ||
87 | $(top_builddir)/modules/output_stream/libscioutput_stream.la | 89 | $(top_builddir)/modules/output_stream/libscioutput_stream.la |
90 | |||
91 | # Cyclic dependancy | ||
92 | # $(top_builddir)/modules/jvm/libscijvm.la | ||
93 | |||
88 | #### Name of the module and the path ###### | 94 | #### Name of the module and the path ###### |
89 | modulename=action_binding | 95 | modulename=action_binding |
90 | 96 | ||
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in index 2a86de2..e3f6c89 100644 --- a/scilab/modules/action_binding/Makefile.in +++ b/scilab/modules/action_binding/Makefile.in | |||
@@ -61,12 +61,13 @@ PRE_UNINSTALL = : | |||
61 | POST_UNINSTALL = : | 61 | POST_UNINSTALL = : |
62 | build_triplet = @build@ | 62 | build_triplet = @build@ |
63 | host_triplet = @host@ | 63 | host_triplet = @host@ |
64 | @GUI_TRUE@am__append_1 = libsciaction_binding.la | ||
64 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | 65 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
65 | $(top_srcdir)/Makefile.incl.am | 66 | $(top_srcdir)/Makefile.incl.am |
66 | @NEED_JAVA_TRUE@am__append_1 = java | 67 | @NEED_JAVA_TRUE@am__append_2 = java |
67 | 68 | ||
68 | # With --enable-compilation-tests, launch java unitary tests | 69 | # With --enable-compilation-tests, launch java unitary tests |
69 | @COMPILATION_TESTS_TRUE@am__append_2 = test | 70 | @COMPILATION_TESTS_TRUE@am__append_3 = test |
70 | subdir = modules/action_binding | 71 | subdir = modules/action_binding |
71 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 72 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
72 | am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ | 73 | am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ |
@@ -115,21 +116,25 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \ | |||
115 | "$(DESTDIR)$(libsciaction_binding_la_rootdir)" \ | 116 | "$(DESTDIR)$(libsciaction_binding_la_rootdir)" \ |
116 | "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)" | 117 | "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)" |
117 | LTLIBRARIES = $(pkglib_LTLIBRARIES) | 118 | LTLIBRARIES = $(pkglib_LTLIBRARIES) |
119 | libsciaction_binding_disable_la_LIBADD = | ||
120 | am_libsciaction_binding_disable_la_OBJECTS = \ | ||
121 | libsciaction_binding_disable_la-noaction_binding.lo | ||
122 | libsciaction_binding_disable_la_OBJECTS = \ | ||
123 | $(am_libsciaction_binding_disable_la_OBJECTS) | ||
124 | libsciaction_binding_disable_la_LINK = $(LIBTOOL) --tag=CC \ | ||
125 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | ||
126 | $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) \ | ||
127 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
118 | libsciaction_binding_la_DEPENDENCIES = \ | 128 | libsciaction_binding_la_DEPENDENCIES = \ |
119 | $(top_builddir)/modules/core/libscicore.la \ | 129 | $(top_builddir)/modules/core/libscicore.la \ |
120 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ | 130 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ |
121 | $(top_builddir)/modules/jvm/libscijvm.la \ | ||
122 | $(top_builddir)/modules/output_stream/libscioutput_stream.la | 131 | $(top_builddir)/modules/output_stream/libscioutput_stream.la |
123 | am__libsciaction_binding_la_SOURCES_DIST = \ | 132 | am__libsciaction_binding_la_SOURCES_DIST = \ |
124 | src/noaction_binding/noaction_binding.c src/c/dynamic_menus.c \ | ||
125 | src/c/InterpreterManagement.c src/jni/Signal.cpp \ | 133 | src/c/InterpreterManagement.c src/jni/Signal.cpp \ |
126 | src/jni/Signal.hxx src/jni/GiwsException.cpp \ | 134 | src/jni/Signal.hxx src/jni/GiwsException.cpp \ |
127 | src/jni/InterpreterManagement_wrap.c \ | 135 | src/jni/InterpreterManagement_wrap.c \ |
128 | sci_gateway/c/gw_action_binding.c \ | 136 | sci_gateway/c/gw_action_binding.c \ |
129 | sci_gateway/cpp/sci_notify.cpp | 137 | sci_gateway/cpp/sci_notify.cpp |
130 | @GUI_FALSE@am__objects_1 = \ | ||
131 | @GUI_FALSE@ libsciaction_binding_la-noaction_binding.lo \ | ||
132 | @GUI_FALSE@ libsciaction_binding_la-dynamic_menus.lo | ||
133 | @GUI_TRUE@am__objects_1 = \ | 138 | @GUI_TRUE@am__objects_1 = \ |
134 | @GUI_TRUE@ libsciaction_binding_la-InterpreterManagement.lo | 139 | @GUI_TRUE@ libsciaction_binding_la-InterpreterManagement.lo |
135 | @GUI_TRUE@am__objects_2 = libsciaction_binding_la-Signal.lo \ | 140 | @GUI_TRUE@am__objects_2 = libsciaction_binding_la-Signal.lo \ |
@@ -146,6 +151,7 @@ libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ | |||
146 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | 151 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ |
147 | $(CXXFLAGS) $(libsciaction_binding_la_LDFLAGS) $(LDFLAGS) -o \ | 152 | $(CXXFLAGS) $(libsciaction_binding_la_LDFLAGS) $(LDFLAGS) -o \ |
148 | $@ | 153 | $@ |
154 | @GUI_TRUE@am_libsciaction_binding_la_rpath = -rpath $(pkglibdir) | ||
149 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes | 155 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes |
150 | depcomp = $(SHELL) $(top_srcdir)/config/depcomp | 156 | depcomp = $(SHELL) $(top_srcdir)/config/depcomp |
151 | am__depfiles_maybe = depfiles | 157 | am__depfiles_maybe = depfiles |
@@ -168,8 +174,10 @@ CXXLD = $(CXX) | |||
168 | CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | 174 | CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
169 | --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ | 175 | --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ |
170 | $(LDFLAGS) -o $@ | 176 | $(LDFLAGS) -o $@ |
171 | SOURCES = $(libsciaction_binding_la_SOURCES) | 177 | SOURCES = $(libsciaction_binding_disable_la_SOURCES) \ |
172 | DIST_SOURCES = $(am__libsciaction_binding_la_SOURCES_DIST) | 178 | $(libsciaction_binding_la_SOURCES) |
179 | DIST_SOURCES = $(libsciaction_binding_disable_la_SOURCES) \ | ||
180 | $(am__libsciaction_binding_la_SOURCES_DIST) | ||
173 | DATA = $(libsciaction_binding_la_etc_DATA) \ | 181 | DATA = $(libsciaction_binding_la_etc_DATA) \ |
174 | $(libsciaction_binding_la_root_DATA) \ | 182 | $(libsciaction_binding_la_root_DATA) \ |
175 | $(libsciaction_binding_la_sci_gateway_DATA) | 183 | $(libsciaction_binding_la_sci_gateway_DATA) |
@@ -417,10 +425,6 @@ top_build_prefix = @top_build_prefix@ | |||
417 | top_builddir = @top_builddir@ | 425 | top_builddir = @top_builddir@ |
418 | top_srcdir = @top_srcdir@ | 426 | top_srcdir = @top_srcdir@ |
419 | @GUI_TRUE@USEANT = 1 | 427 | @GUI_TRUE@USEANT = 1 |
420 | # List of the c files | ||
421 | @GUI_FALSE@ACTION_BINDING_C_SOURCES = src/noaction_binding/noaction_binding.c \ | ||
422 | @GUI_FALSE@src/c/dynamic_menus.c | ||
423 | |||
424 | 428 | ||
425 | # List of the c files | 429 | # List of the c files |
426 | @GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c | 430 | @GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c |
@@ -441,6 +445,10 @@ top_srcdir = @top_srcdir@ | |||
441 | @GIWS_TRUE@BUILT_SOURCES = giws | 445 | @GIWS_TRUE@BUILT_SOURCES = giws |
442 | @SWIG_TRUE@BUILT_SOURCES = swig | 446 | @SWIG_TRUE@BUILT_SOURCES = swig |
443 | GIWS_WRAPPERS = src/jni/Signal.giws.xml | 447 | GIWS_WRAPPERS = src/jni/Signal.giws.xml |
448 | libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.c | ||
449 | libsciaction_binding_disable_la_CFLAGS = -I$(srcdir)/includes/ \ | ||
450 | -I$(top_srcdir)/modules/output_stream/includes | ||
451 | |||
444 | 452 | ||
445 | # Includes need for the compilation | 453 | # Includes need for the compilation |
446 | libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \ | 454 | libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \ |
@@ -466,7 +474,7 @@ libsciaction_binding_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \ | |||
466 | 474 | ||
467 | # Name of the future library (.la will be replace by .so, .a, etc regarding | 475 | # Name of the future library (.la will be replace by .so, .a, etc regarding |
468 | # the system) | 476 | # the system) |
469 | pkglib_LTLIBRARIES = libsciaction_binding.la | 477 | pkglib_LTLIBRARIES = libsciaction_binding-disable.la $(am__append_1) |
470 | libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS) | 478 | libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS) |
471 | 479 | ||
472 | # All the sources needed by libsciaction_binding.la | 480 | # All the sources needed by libsciaction_binding.la |
@@ -477,9 +485,12 @@ CHECK_SRC = $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES) | |||
477 | INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS) | 485 | INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS) |
478 | libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \ | 486 | libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \ |
479 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ | 487 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ |
480 | $(top_builddir)/modules/jvm/libscijvm.la \ | ||
481 | $(top_builddir)/modules/output_stream/libscioutput_stream.la | 488 | $(top_builddir)/modules/output_stream/libscioutput_stream.la |
482 | 489 | ||
490 | |||
491 | # Cyclic dependancy | ||
492 | # $(top_builddir)/modules/jvm/libscijvm.la | ||
493 | |||
483 | #### Name of the module and the path ###### | 494 | #### Name of the module and the path ###### |
484 | modulename = action_binding | 495 | modulename = action_binding |
485 | 496 | ||
@@ -506,7 +517,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL | |||
506 | #### the procedure will be the same with Microsoft Windows (C) | 517 | #### the procedure will be the same with Microsoft Windows (C) |
507 | #### and Linux/Unix | 518 | #### and Linux/Unix |
508 | ####################################################################### | 519 | ####################################################################### |
509 | TARGETS_ALL = $(am__append_1) $(am__append_2) | 520 | TARGETS_ALL = $(am__append_2) $(am__append_3) |
510 | 521 | ||
511 | ################ MACROS ###################### | 522 | ################ MACROS ###################### |
512 | # Rule to build a macro | 523 | # Rule to build a macro |
@@ -623,8 +634,10 @@ clean-pkglibLTLIBRARIES: | |||
623 | echo "rm -f \"$${dir}/so_locations\""; \ | 634 | echo "rm -f \"$${dir}/so_locations\""; \ |
624 | rm -f "$${dir}/so_locations"; \ | 635 | rm -f "$${dir}/so_locations"; \ |
625 | done | 636 | done |
637 | libsciaction_binding-disable.la: $(libsciaction_binding_disable_la_OBJECTS) $(libsciaction_binding_disable_la_DEPENDENCIES) | ||
638 | $(libsciaction_binding_disable_la_LINK) -rpath $(pkglibdir) $(libsciaction_binding_disable_la_OBJECTS) $(libsciaction_binding_disable_la_LIBADD) $(LIBS) | ||
626 | libsciaction_binding.la: $(libsciaction_binding_la_OBJECTS) $(libsciaction_binding_la_DEPENDENCIES) | 639 | libsciaction_binding.la: $(libsciaction_binding_la_OBJECTS) $(libsciaction_binding_la_DEPENDENCIES) |
627 | $(libsciaction_binding_la_LINK) -rpath $(pkglibdir) $(libsciaction_binding_la_OBJECTS) $(libsciaction_binding_la_LIBADD) $(LIBS) | 640 | $(libsciaction_binding_la_LINK) $(am_libsciaction_binding_la_rpath) $(libsciaction_binding_la_OBJECTS) $(libsciaction_binding_la_LIBADD) $(LIBS) |
628 | 641 | ||
629 | mostlyclean-compile: | 642 | mostlyclean-compile: |
630 | -rm -f *.$(OBJEXT) | 643 | -rm -f *.$(OBJEXT) |
@@ -632,13 +645,12 @@ mostlyclean-compile: | |||
632 | distclean-compile: | 645 | distclean-compile: |
633 | -rm -f *.tab.c | 646 | -rm -f *.tab.c |
634 | 647 | ||
648 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo@am__quote@ | ||
635 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-GiwsException.Plo@am__quote@ | 649 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-GiwsException.Plo@am__quote@ |
636 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo@am__quote@ | 650 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo@am__quote@ |
637 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo@am__quote@ | 651 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo@am__quote@ |
638 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-Signal.Plo@am__quote@ | 652 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-Signal.Plo@am__quote@ |
639 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo@am__quote@ | ||
640 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo@am__quote@ | 653 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo@am__quote@ |
641 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo@am__quote@ | ||
642 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-sci_notify.Plo@am__quote@ | 654 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-sci_notify.Plo@am__quote@ |
643 | 655 | ||
644 | .c.o: | 656 | .c.o: |
@@ -662,19 +674,12 @@ distclean-compile: | |||
662 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 674 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
663 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | 675 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
664 | 676 | ||
665 | libsciaction_binding_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c | 677 | libsciaction_binding_disable_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c |
666 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c | 678 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_disable_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c |
667 | @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo | 679 | @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo |
668 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@ | 680 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_disable_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@ |
669 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
670 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c | ||
671 | |||
672 | libsciaction_binding_la-dynamic_menus.lo: src/c/dynamic_menus.c | ||
673 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-dynamic_menus.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c | ||
674 | @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo | ||
675 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/dynamic_menus.c' object='libsciaction_binding_la-dynamic_menus.lo' libtool=yes @AMDEPBACKSLASH@ | ||
676 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 681 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
677 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c | 682 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c |
678 | 683 | ||
679 | libsciaction_binding_la-InterpreterManagement.lo: src/c/InterpreterManagement.c | 684 | libsciaction_binding_la-InterpreterManagement.lo: src/c/InterpreterManagement.c |
680 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c | 685 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c |
diff --git a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.c b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.c index e9aa7ad..5940ef9 100644 --- a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.c +++ b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | * Copyright (C) 2007-2008 - INRIA - Vincent COUVERT <vincent.couvert@inria.fr> | 3 | * Copyright (C) 2010 - DIGITEO - Bruno JOFRET |
4 | * | 4 | * |
5 | * This file must be used under the terms of the CeCILL. | 5 | * This file must be used under the terms of the CeCILL. |
6 | * This source file is licensed as described in the file COPYING, which | 6 | * This source file is licensed as described in the file COPYING, which |
@@ -10,15 +10,11 @@ | |||
10 | * | 10 | * |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "InterpreterManagement.h" | 13 | #include "Scierror.h" |
14 | /*--------------------------------------------------------------------------*/ | 14 | #include "localization.h" |
15 | int putCommandInScilabQueue(char *command) | 15 | |
16 | { | 16 | int gw_action_binding() |
17 | return 0; | ||
18 | } | ||
19 | /*--------------------------------------------------------------------------*/ | ||
20 | int interruptScilab(void) | ||
21 | { | 17 | { |
22 | return 0; | 18 | Scierror(999,_("Scilab '%s' module not installed.\n"), "action_binding"); |
19 | return 0; | ||
23 | } | 20 | } |
24 | /*--------------------------------------------------------------------------*/ | ||
diff --git a/scilab/modules/console/Makefile.am b/scilab/modules/console/Makefile.am index 0971b1c..17a8b3a 100644 --- a/scilab/modules/console/Makefile.am +++ b/scilab/modules/console/Makefile.am | |||
@@ -94,7 +94,9 @@ INCLUDE_FLAGS = $(libsciconsole_la_CFLAGS) | |||
94 | 94 | ||
95 | ## Libraries necessary | 95 | ## Libraries necessary |
96 | ## Change to include other Scilab modules/lib | 96 | ## Change to include other Scilab modules/lib |
97 | libsciconsole_la_LIBADD = $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/shell/libscishell.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la | 97 | libsciconsole_la_LIBADD = $(top_builddir)/modules/shell/libscishell.la \ |
98 | $(top_builddir)/modules/fileio/libscifileio.la \ | ||
99 | $(top_builddir)/libs/MALLOC/libscimalloc.la | ||
98 | # java code is needed $(top_builddir)/modules/jvm/libscijvm.la | 100 | # java code is needed $(top_builddir)/modules/jvm/libscijvm.la |
99 | 101 | ||
100 | 102 | ||
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in index 25d6051..8b4443a 100644 --- a/scilab/modules/console/Makefile.in +++ b/scilab/modules/console/Makefile.in | |||
@@ -130,7 +130,7 @@ libsciconsole_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | |||
130 | $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | 130 | $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
131 | $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | 131 | $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
132 | $(LDFLAGS) -o $@ | 132 | $(LDFLAGS) -o $@ |
133 | libsciconsole_la_DEPENDENCIES = $(top_builddir)/modules/action_binding/libsciaction_binding.la \ | 133 | libsciconsole_la_DEPENDENCIES = \ |
134 | $(top_builddir)/modules/shell/libscishell.la \ | 134 | $(top_builddir)/modules/shell/libscishell.la \ |
135 | $(top_builddir)/modules/fileio/libscifileio.la \ | 135 | $(top_builddir)/modules/fileio/libscifileio.la \ |
136 | $(top_builddir)/libs/MALLOC/libscimalloc.la | 136 | $(top_builddir)/libs/MALLOC/libscimalloc.la |
@@ -490,7 +490,10 @@ libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSO | |||
490 | # For the code check (splint) | 490 | # For the code check (splint) |
491 | CHECK_SRC = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) | 491 | CHECK_SRC = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) |
492 | INCLUDE_FLAGS = $(libsciconsole_la_CFLAGS) | 492 | INCLUDE_FLAGS = $(libsciconsole_la_CFLAGS) |
493 | libsciconsole_la_LIBADD = $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/shell/libscishell.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la | 493 | libsciconsole_la_LIBADD = $(top_builddir)/modules/shell/libscishell.la \ |
494 | $(top_builddir)/modules/fileio/libscifileio.la \ | ||
495 | $(top_builddir)/libs/MALLOC/libscimalloc.la | ||
496 | |||
494 | # java code is needed $(top_builddir)/modules/jvm/libscijvm.la | 497 | # java code is needed $(top_builddir)/modules/jvm/libscijvm.la |
495 | 498 | ||
496 | #### SWIG Declaration #### | 499 | #### SWIG Declaration #### |
diff --git a/scilab/modules/shell/Makefile.am b/scilab/modules/shell/Makefile.am index 5383825..9d81500 100644 --- a/scilab/modules/shell/Makefile.am +++ b/scilab/modules/shell/Makefile.am | |||
@@ -74,7 +74,10 @@ INCLUDE_FLAGS = $(libscishell_la_CFLAGS) | |||
74 | 74 | ||
75 | ## Libraries necessary | 75 | ## Libraries necessary |
76 | # cyclic dep $(top_builddir)/modules/console/libsciconsole.la | 76 | # cyclic dep $(top_builddir)/modules/console/libsciconsole.la |
77 | libscishell_la_LIBADD = $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la | 77 | libscishell_la_LIBADD = $(top_builddir)/modules/history_manager/libscihistory_manager.la \ |
78 | $(top_builddir)/modules/core/libscicore.la \ | ||
79 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ | ||
80 | $(top_builddir)/modules/output_stream/libscioutput_stream.la | ||
78 | # $(top_builddir)/modules/completion/libscicompletion.la | 81 | # $(top_builddir)/modules/completion/libscicompletion.la |
79 | modulename=shell | 82 | modulename=shell |
80 | 83 | ||
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in index c0f988a..4c31234 100644 --- a/scilab/modules/shell/Makefile.in +++ b/scilab/modules/shell/Makefile.in | |||
@@ -116,8 +116,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \ | |||
116 | "$(DESTDIR)$(libscishell_la_sci_gatewaydir)" \ | 116 | "$(DESTDIR)$(libscishell_la_sci_gatewaydir)" \ |
117 | "$(DESTDIR)$(libscishell_la_includedir)" | 117 | "$(DESTDIR)$(libscishell_la_includedir)" |
118 | LTLIBRARIES = $(pkglib_LTLIBRARIES) | 118 | LTLIBRARIES = $(pkglib_LTLIBRARIES) |
119 | libscishell_la_DEPENDENCIES = $(top_builddir)/modules/action_binding/libsciaction_binding.la \ | 119 | libscishell_la_DEPENDENCIES = $(top_builddir)/modules/history_manager/libscihistory_manager.la \ |
120 | $(top_builddir)/modules/history_manager/libscihistory_manager.la \ | ||
121 | $(top_builddir)/modules/core/libscicore.la \ | 120 | $(top_builddir)/modules/core/libscicore.la \ |
122 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ | 121 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ |
123 | $(top_builddir)/modules/output_stream/libscioutput_stream.la | 122 | $(top_builddir)/modules/output_stream/libscioutput_stream.la |
@@ -461,7 +460,11 @@ CHECK_SRC = $(libscishell_la_SOURCES) | |||
461 | INCLUDE_FLAGS = $(libscishell_la_CFLAGS) | 460 | INCLUDE_FLAGS = $(libscishell_la_CFLAGS) |
462 | 461 | ||
463 | # cyclic dep $(top_builddir)/modules/console/libsciconsole.la | 462 | # cyclic dep $(top_builddir)/modules/console/libsciconsole.la |
464 | libscishell_la_LIBADD = $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la | 463 | libscishell_la_LIBADD = $(top_builddir)/modules/history_manager/libscihistory_manager.la \ |
464 | $(top_builddir)/modules/core/libscicore.la \ | ||
465 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ | ||
466 | $(top_builddir)/modules/output_stream/libscioutput_stream.la | ||
467 | |||
465 | # $(top_builddir)/modules/completion/libscicompletion.la | 468 | # $(top_builddir)/modules/completion/libscicompletion.la |
466 | modulename = shell | 469 | modulename = shell |
467 | 470 | ||
diff --git a/scilab/modules/tclsci/Makefile.am b/scilab/modules/tclsci/Makefile.am index 1f31721..14c874f 100644 --- a/scilab/modules/tclsci/Makefile.am +++ b/scilab/modules/tclsci/Makefile.am | |||
@@ -67,7 +67,10 @@ libscitclsci_la_SOURCES = $(TCLSCI_C_SOURCES) $(GATEWAY_C_SOURCES) | |||
67 | CHECK_SRC= $(libscitclsci_la_SOURCES) | 67 | CHECK_SRC= $(libscitclsci_la_SOURCES) |
68 | INCLUDE_FLAGS = $(libscitclsci_la_CFLAGS) | 68 | INCLUDE_FLAGS = $(libscitclsci_la_CFLAGS) |
69 | 69 | ||
70 | libscitclsci_la_LIBADD = $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la | 70 | libscitclsci_la_LIBADD = $(top_builddir)/modules/fileio/libscifileio.la \ |
71 | $(top_builddir)/modules/core/libscicore.la \ | ||
72 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ | ||
73 | $(top_builddir)/modules/output_stream/libscioutput_stream.la | ||
71 | #### Target ###### | 74 | #### Target ###### |
72 | modulename=tclsci | 75 | modulename=tclsci |
73 | 76 | ||
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in index 15afe38..74e2a1c 100644 --- a/scilab/modules/tclsci/Makefile.in +++ b/scilab/modules/tclsci/Makefile.in | |||
@@ -111,7 +111,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \ | |||
111 | "$(DESTDIR)$(libscitclsci_la_sci_gatewaydir)" \ | 111 | "$(DESTDIR)$(libscitclsci_la_sci_gatewaydir)" \ |
112 | "$(DESTDIR)$(libscitclsci_la_tcldir)" | 112 | "$(DESTDIR)$(libscitclsci_la_tcldir)" |
113 | LTLIBRARIES = $(pkglib_LTLIBRARIES) | 113 | LTLIBRARIES = $(pkglib_LTLIBRARIES) |
114 | libscitclsci_la_DEPENDENCIES = $(top_builddir)/modules/action_binding/libsciaction_binding.la \ | 114 | libscitclsci_la_DEPENDENCIES = \ |
115 | $(top_builddir)/modules/fileio/libscifileio.la \ | 115 | $(top_builddir)/modules/fileio/libscifileio.la \ |
116 | $(top_builddir)/modules/core/libscicore.la \ | 116 | $(top_builddir)/modules/core/libscicore.la \ |
117 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ | 117 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ |
@@ -482,7 +482,11 @@ libscitclsci_la_SOURCES = $(TCLSCI_C_SOURCES) $(GATEWAY_C_SOURCES) | |||
482 | # For the code check (splint) | 482 | # For the code check (splint) |
483 | CHECK_SRC = $(libscitclsci_la_SOURCES) | 483 | CHECK_SRC = $(libscitclsci_la_SOURCES) |
484 | INCLUDE_FLAGS = $(libscitclsci_la_CFLAGS) | 484 | INCLUDE_FLAGS = $(libscitclsci_la_CFLAGS) |
485 | libscitclsci_la_LIBADD = $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la | 485 | libscitclsci_la_LIBADD = $(top_builddir)/modules/fileio/libscifileio.la \ |
486 | $(top_builddir)/modules/core/libscicore.la \ | ||
487 | $(top_builddir)/libs/MALLOC/libscimalloc.la \ | ||
488 | $(top_builddir)/modules/output_stream/libscioutput_stream.la | ||
489 | |||
486 | #### Target ###### | 490 | #### Target ###### |
487 | modulename = tclsci | 491 | modulename = tclsci |
488 | 492 | ||