summaryrefslogtreecommitdiffstats
path: root/scilab/modules/compatibility_functions
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-10-07 15:05:33 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-10-07 15:05:33 +0200
commit85ed6f7895953c284108b9b1d57a3bdf451943ca (patch)
tree1ba82a9674314ae6a45f57818fdf7de08b2cc8b0 /scilab/modules/compatibility_functions
parentce97f4061c5e955674801f98b14e1db015106ec4 (diff)
parent52c46d77363e660a7e6897d869cc3b2bd26b2807 (diff)
downloadscilab-85ed6f7895953c284108b9b1d57a3bdf451943ca.zip
scilab-85ed6f7895953c284108b9b1d57a3bdf451943ca.tar.gz
Merge branch 'master' of git@git.scilab.org:scilab
Diffstat (limited to 'scilab/modules/compatibility_functions')
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in13
1 files changed, 9 insertions, 4 deletions
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index e06f423..331270f 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -113,6 +113,7 @@ ACLOCAL = @ACLOCAL@
113ALL_LINGUAS = @ALL_LINGUAS@ 113ALL_LINGUAS = @ALL_LINGUAS@
114AMTAR = @AMTAR@ 114AMTAR = @AMTAR@
115ANT = @ANT@ 115ANT = @ANT@
116ANTLR = @ANTLR@
116AR = @AR@ 117AR = @AR@
117AUTOCONF = @AUTOCONF@ 118AUTOCONF = @AUTOCONF@
118AUTOHEADER = @AUTOHEADER@ 119AUTOHEADER = @AUTOHEADER@
@@ -124,6 +125,8 @@ BLAS_LIBS = @BLAS_LIBS@
124CC = @CC@ 125CC = @CC@
125CCDEPMODE = @CCDEPMODE@ 126CCDEPMODE = @CCDEPMODE@
126CFLAGS = @CFLAGS@ 127CFLAGS = @CFLAGS@
128CHECKSTYLE = @CHECKSTYLE@
129COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
127COMMONS_IO = @COMMONS_IO@ 130COMMONS_IO = @COMMONS_IO@
128COMMONS_LOGGING = @COMMONS_LOGGING@ 131COMMONS_LOGGING = @COMMONS_LOGGING@
129CPP = @CPP@ 132CPP = @CPP@
@@ -251,12 +254,12 @@ RT_LIB = @RT_LIB@
251SAXON = @SAXON@ 254SAXON = @SAXON@
252SCICOS_ENABLE = @SCICOS_ENABLE@ 255SCICOS_ENABLE = @SCICOS_ENABLE@
253SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 256SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
254SCIPAD_ENABLE = @SCIPAD_ENABLE@
255SED = @SED@ 257SED = @SED@
256SET_MAKE = @SET_MAKE@ 258SET_MAKE = @SET_MAKE@
257SET_RELOCATABLE = @SET_RELOCATABLE@ 259SET_RELOCATABLE = @SET_RELOCATABLE@
258SHELL = @SHELL@ 260SHELL = @SHELL@
259SKINLF = @SKINLF@ 261SKINLF = @SKINLF@
262SPLINT = @SPLINT@
260STRIP = @STRIP@ 263STRIP = @STRIP@
261SWIG_BIN = @SWIG_BIN@ 264SWIG_BIN = @SWIG_BIN@
262SWIG_JAVA = @SWIG_JAVA@ 265SWIG_JAVA = @SWIG_JAVA@
@@ -658,10 +661,12 @@ check-local: $(top_builddir)/scilab-bin
658 export LANG=C;\ 661 export LANG=C;\
659 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 662 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
660check-code: 663check-code:
661 @if test -f build.xml; then \ 664 if test -f build.xml; then \
662 $(ANT) checkstyle; \ 665 $(ANT) checkstyle; \
663 fi;\ 666 fi
664 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) 667 if test -x "$(SPLINT)"; then \
668 $(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); \
669 fi
665@NEED_JAVA_TRUE@java: 670@NEED_JAVA_TRUE@java:
666# Some configurations needs to export JAVA_HOME in the current env 671# Some configurations needs to export JAVA_HOME in the current env
667@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 672@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \