summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-10-08 11:43:54 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-10-08 11:43:54 +0200
commit065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc (patch)
tree99240a3d0878eaf146282f82d0c46dd6477782d8 /scilab/modules/intersci
parent49be97c171c4e7281b53b0d1f5758cb330e3c844 (diff)
parente6bb34a2151dd4e126d51062e2ab389ecbb85439 (diff)
downloadscilab-065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc.zip
scilab-065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/Version.incl scilab/configure scilab/modules/Makefile.in scilab/modules/core/includes/version.h
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in15
1 files changed, 10 insertions, 5 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 3148039..0ea19ea 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -78,7 +78,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
80 $(ACLOCAL_M4) 80 $(ACLOCAL_M4)
81mkinstalldirs = $(install_sh) -d 81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
82CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 82CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
83CONFIG_CLEAN_FILES = 83CONFIG_CLEAN_FILES =
84CONFIG_CLEAN_VPATH_FILES = 84CONFIG_CLEAN_VPATH_FILES =
@@ -149,6 +149,7 @@ ACLOCAL = @ACLOCAL@
149ALL_LINGUAS = @ALL_LINGUAS@ 149ALL_LINGUAS = @ALL_LINGUAS@
150AMTAR = @AMTAR@ 150AMTAR = @AMTAR@
151ANT = @ANT@ 151ANT = @ANT@
152ANTLR = @ANTLR@
152AR = @AR@ 153AR = @AR@
153AUTOCONF = @AUTOCONF@ 154AUTOCONF = @AUTOCONF@
154AUTOHEADER = @AUTOHEADER@ 155AUTOHEADER = @AUTOHEADER@
@@ -160,6 +161,8 @@ BLAS_LIBS = @BLAS_LIBS@
160CC = @CC@ 161CC = @CC@
161CCDEPMODE = @CCDEPMODE@ 162CCDEPMODE = @CCDEPMODE@
162CFLAGS = @CFLAGS@ 163CFLAGS = @CFLAGS@
164CHECKSTYLE = @CHECKSTYLE@
165COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
163COMMONS_IO = @COMMONS_IO@ 166COMMONS_IO = @COMMONS_IO@
164COMMONS_LOGGING = @COMMONS_LOGGING@ 167COMMONS_LOGGING = @COMMONS_LOGGING@
165CPP = @CPP@ 168CPP = @CPP@
@@ -288,12 +291,12 @@ RT_LIB = @RT_LIB@
288SAXON = @SAXON@ 291SAXON = @SAXON@
289SCICOS_ENABLE = @SCICOS_ENABLE@ 292SCICOS_ENABLE = @SCICOS_ENABLE@
290SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 293SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
291SCIPAD_ENABLE = @SCIPAD_ENABLE@
292SED = @SED@ 294SED = @SED@
293SET_MAKE = @SET_MAKE@ 295SET_MAKE = @SET_MAKE@
294SET_RELOCATABLE = @SET_RELOCATABLE@ 296SET_RELOCATABLE = @SET_RELOCATABLE@
295SHELL = @SHELL@ 297SHELL = @SHELL@
296SKINLF = @SKINLF@ 298SKINLF = @SKINLF@
299SPLINT = @SPLINT@
297STRIP = @STRIP@ 300STRIP = @STRIP@
298SWIG_BIN = @SWIG_BIN@ 301SWIG_BIN = @SWIG_BIN@
299SWIG_JAVA = @SWIG_JAVA@ 302SWIG_JAVA = @SWIG_JAVA@
@@ -1074,10 +1077,12 @@ check-local: $(top_builddir)/scilab-bin
1074 export LANG=C;\ 1077 export LANG=C;\
1075 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 1078 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
1076check-code: 1079check-code:
1077 @if test -f build.xml; then \ 1080 if test -f build.xml; then \
1078 $(ANT) checkstyle; \ 1081 $(ANT) checkstyle; \
1079 fi;\ 1082 fi
1080 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 1083 if test -x "$(SPLINT)"; then \
1084 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
1085 fi
1081@NEED_JAVA_TRUE@java: 1086@NEED_JAVA_TRUE@java:
1082# Some configurations needs to export JAVA_HOME in the current env 1087# Some configurations needs to export JAVA_HOME in the current env
1083@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 1088@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \