jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Scilab: add Scilab in makefile check version targets"

Browse source 
This reverts commit 66edc244b9.
This commit is contained in:
Simon Marchetto 2013-08-09 14:46:39 +02:00
commit ff25d2c536
3 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Examples/Makefile.in
View file

@ -1577,7 +1577,6 @@ SCILAB_LIB = @SCILABLIB@
SCILAB = @SCILAB@ SCILAB = @SCILAB@
SCILABOPT = SCILABOPT =
SCILAB_START_OPT = @SCILABSTARTOPT@ SCILAB_START_OPT = @SCILABSTARTOPT@
SCILAB_VERSION = @SCILABVERSION@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# Build a C dynamically loadable module # Build a C dynamically loadable module
@ -1637,13 +1636,6 @@ scilab_run:
scilab_debug: scilab_debug:
@env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH $(SCILAB) -noatomsautoload -nb -debug -f runme.sci @env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH $(SCILAB) -noatomsautoload -nb -debug -f runme.sci
# -----------------------------------------------------------------
# Version display
# -----------------------------------------------------------------
scilab_version:
echo $(SCILAB_VERSION)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Cleaning the scilab examples # Cleaning the scilab examples
# ----------------------------------------------------------------- # -----------------------------------------------------------------

3
Makefile.in
View file

@ -149,7 +149,6 @@ check-versions: \
check-uffi-version \ check-uffi-version \
check-cffi-version \ check-cffi-version \
check-r-version \ check-r-version \
check-scilab-version \
check-go-version \ check-go-version \
check-d-version check-d-version
@ -471,7 +470,7 @@ lib-languages = gcj typemaps tcl perl5 python guile java mzscheme ruby php ocaml
lib-modules = std lib-modules = std
install-lib: install-lib:
@echo "Installing the SWIG library" @echo "Installing the SWIG library"
@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB) @$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)
@for file in $(srcdir)/Lib/*.i $(srcdir)/Lib/*.swg ; do \ @for file in $(srcdir)/Lib/*.i $(srcdir)/Lib/*.swg ; do \

7
configure.ac
View file

@ -1036,9 +1036,9 @@ fi
# Get Scilab version # Get Scilab version
AC_MSG_CHECKING(for Scilab version) AC_MSG_CHECKING(for Scilab version)
SCILABVERSION=`$SCILAB -version|sed -e 's|Scilab version \"\(.*\)\"|\1|g'|head -1` SCILAB_VERSION=`$SCILAB -version|sed -e 's|Scilab version \"\(.*\)\"|\1|g'|head -1`
AC_MSG_RESULT($SCILABVERSION) AC_MSG_RESULT($SCILAB_VERSION)
SCILAB_MAJOR_VERSION=`echo $SCILABVERSION | cut -d. -f1` SCILAB_MAJOR_VERSION=`echo $SCILAB_VERSION | cut -d. -f1`
SCILAB_MINOR_VERSION=`echo $SCILAB_VERSION | cut -d. -f2` SCILAB_MINOR_VERSION=`echo $SCILAB_VERSION | cut -d. -f2`
# Set Scilab startup options depending on version # Set Scilab startup options depending on version
@ -1059,7 +1059,6 @@ AC_SUBST(SCILABDYNAMICLINKING)
AC_SUBST(SCILABLIB) AC_SUBST(SCILABLIB)
AC_SUBST(SCILABCCFLAGS) AC_SUBST(SCILABCCFLAGS)
AC_SUBST(SCILABSTARTOPT) AC_SUBST(SCILABSTARTOPT)
AC_SUBST(SCILABVERSION)
#---------------------------------------------------------------- #----------------------------------------------------------------
# Look for java # Look for java