summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-03-30 15:13:37 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-03-30 15:13:37 +0200
commit524268009c88cf819941238ecb91de9186c50706 (patch)
tree3b82d3b39b396d50ee73ff3e0bb9670f02473731 /scilab/modules/shell
parent361e46c930dc2727759c7fead22952f3962e5cc8 (diff)
parentdd635c3a3b2f2fc2f7eb870c6fd52b6c89b42489 (diff)
downloadscilab-524268009c88cf819941238ecb91de9186c50706.zip
scilab-524268009c88cf819941238ecb91de9186c50706.tar.gz
Merge remote branch 'origin/5.2'
Diffstat (limited to 'scilab/modules/shell')
-rw-r--r--scilab/modules/shell/Makefile.am3
-rw-r--r--scilab/modules/shell/Makefile.in33
2 files changed, 18 insertions, 18 deletions
diff --git a/scilab/modules/shell/Makefile.am b/scilab/modules/shell/Makefile.am
index 6c1588c..5383825 100644
--- a/scilab/modules/shell/Makefile.am
+++ b/scilab/modules/shell/Makefile.am
@@ -55,6 +55,9 @@ libscishell_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
55 -I$(top_srcdir)/modules/fileio/src/c/ \ 55 -I$(top_srcdir)/modules/fileio/src/c/ \
56 -I$(top_srcdir)/modules/api_scilab/includes \ 56 -I$(top_srcdir)/modules/api_scilab/includes \
57 -I$(top_srcdir)/modules/fileio/includes/ 57 -I$(top_srcdir)/modules/fileio/includes/
58if IS_MACOSX
59libscishell_la_CFLAGS += -msse2
60endif
58 61
59# Name of the future library (.la will be replace by .so, .a, etc regarding 62# Name of the future library (.la will be replace by .so, .a, etc regarding
60# the system) 63# the system)
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index c0b3a03..ae6e2f8 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -60,9 +60,10 @@ POST_UNINSTALL = :
60build_triplet = @build@ 60build_triplet = @build@
61host_triplet = @host@ 61host_triplet = @host@
62@IS_MACOSX_TRUE@am__append_1 = src/c/others/initMacOSXEnv.c 62@IS_MACOSX_TRUE@am__append_1 = src/c/others/initMacOSXEnv.c
63@IS_MACOSX_TRUE@am__append_2 = -msse2
63DIST_COMMON = $(libscishell_la_include_HEADERS) $(srcdir)/Makefile.am \ 64DIST_COMMON = $(libscishell_la_include_HEADERS) $(srcdir)/Makefile.am \
64 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am 65 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
65@NEED_JAVA_TRUE@am__append_2 = java 66@NEED_JAVA_TRUE@am__append_3 = java
66subdir = modules/shell 67subdir = modules/shell
67ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 68ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 69am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -293,7 +294,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
293PACKAGE_NAME = @PACKAGE_NAME@ 294PACKAGE_NAME = @PACKAGE_NAME@
294PACKAGE_STRING = @PACKAGE_STRING@ 295PACKAGE_STRING = @PACKAGE_STRING@
295PACKAGE_TARNAME = @PACKAGE_TARNAME@ 296PACKAGE_TARNAME = @PACKAGE_TARNAME@
296PACKAGE_URL = @PACKAGE_URL@
297PACKAGE_VERSION = @PACKAGE_VERSION@ 297PACKAGE_VERSION = @PACKAGE_VERSION@
298PATH_SEPARATOR = @PATH_SEPARATOR@ 298PATH_SEPARATOR = @PATH_SEPARATOR@
299PCRE_CFLAGS = @PCRE_CFLAGS@ 299PCRE_CFLAGS = @PCRE_CFLAGS@
@@ -431,21 +431,18 @@ libscishell_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
431 431
432 432
433# Includes need for the compilation 433# Includes need for the compilation
434libscishell_la_CFLAGS = $(JAVA_JNI_INCLUDE) \ 434libscishell_la_CFLAGS = $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/c/ \
435 -Iincludes/ \ 435 -I$(top_srcdir)/libs/MALLOC/includes/ \
436 -Isrc/c/ \ 436 -I$(top_srcdir)/modules/console/includes/ \
437 -I$(top_srcdir)/libs/MALLOC/includes/ \ 437 -I$(top_srcdir)/modules/history_manager/includes/ \
438 -I$(top_srcdir)/modules/console/includes/ \ 438 -I$(top_srcdir)/modules/output_stream/includes \
439 -I$(top_srcdir)/modules/history_manager/includes/ \ 439 -I$(top_srcdir)/modules/core/includes \
440 -I$(top_srcdir)/modules/output_stream/includes \ 440 -I$(top_srcdir)/modules/completion/includes \
441 -I$(top_srcdir)/modules/core/includes \ 441 -I$(top_srcdir)/modules/localization/includes \
442 -I$(top_srcdir)/modules/completion/includes \ 442 -I$(top_srcdir)/modules/action_binding/includes/ \
443 -I$(top_srcdir)/modules/localization/includes \ 443 -I$(top_srcdir)/modules/fileio/src/c/ \
444 -I$(top_srcdir)/modules/action_binding/includes/ \ 444 -I$(top_srcdir)/modules/api_scilab/includes \
445 -I$(top_srcdir)/modules/fileio/src/c/ \ 445 -I$(top_srcdir)/modules/fileio/includes/ $(am__append_2)
446 -I$(top_srcdir)/modules/api_scilab/includes \
447 -I$(top_srcdir)/modules/fileio/includes/
448
449 446
450# Name of the future library (.la will be replace by .so, .a, etc regarding 447# Name of the future library (.la will be replace by .so, .a, etc regarding
451# the system) 448# the system)
@@ -494,7 +491,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
494#### the procedure will be the same with Microsoft Windows (C) 491#### the procedure will be the same with Microsoft Windows (C)
495#### and Linux/Unix 492#### and Linux/Unix
496####################################################################### 493#######################################################################
497TARGETS_ALL = $(am__append_2) 494TARGETS_ALL = $(am__append_3)
498 495
499################ MACROS ###################### 496################ MACROS ######################
500# Rule to build a macro 497# Rule to build a macro