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

scilab: Examples makefile, remove scilab args macro and checks

Browse source
This commit is contained in:
Simon Marchetto 2014-06-26 10:35:31 +02:00
commit 08049cb1e8
1 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Examples/Makefile.in
View file

@ -1702,54 +1702,51 @@ r_clean:
################################################################## ##################################################################
# Make sure these locate your Scilab installation # Make sure these locate your Scilab installation
SCILAB_LIB = @SCILABLIB@
SCILAB = @SCILAB@ SCILAB = @SCILAB@
SCILAB_OPT = @SCILABOPT@ SCILAB_OPT = @SCILABOPT@
# Returns the SWIG Scilab command line args
define get_swig_scilab_args
SCILAB_SWIGOPT :=
ifdef SRCS
SCILAB_SWIGOPT += -addsources "$(SRCDIR_SRCS)"
endif
ifdef INCLUDES
SCILAB_SWIGOPT += -addcflags "-I$(abspath $(INCLUDES))"
endif
ifdef SRCDIR
SCILAB_SWIGOPT += -addcflags "-I$(abspath $(SRCDIR))"
endif
endef
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# Build a C dynamically loadable module # Build a C dynamically loadable module
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab: $(SRCDIR_SRCS) scilab: $(SRCDIR_SRCS)
$(eval $(call get_swig_scilab_args)) ifdef SRCS \
$(SWIG) -scilab $(SCILAB_SWIGOPT) $(SWIGOPT) $(INTERFACEPATH) SCILAB_SWIGOPT += -addsources "$(SRCDIR_SRCS)" \
if [ -f builder.sce ]; then \ endif \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \ ifdef INCLUDES \
fi SCILAB_SWIGOPT += -addcflags "-I$(abspath $(INCLUDES))" \
endif \
ifdef SRCDIR \
SCILAB_SWIGOPT += -addcflags "-I$(abspath $(SRCDIR))" \
endif \
$(SWIG) -scilab $(SCILAB_SWIGOPT) $(SWIGOPT) $(INTERFACEPATH) \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# Build a C++ dynamically loadable module # Build a C++ dynamically loadable module
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab_cpp: $(SRCDIR_SRCS) scilab_cpp: $(SRCDIR_SRCS)
$(eval $(call get_swig_scilab_args)) SCILAB_SWIGOPT = \
$(SWIG) -scilab -c++ $(SCILAB_SWIGOPT) $(SWIGOPT) $(INTERFACEPATH) ifdef SRCS \
if [ -f builder.sce ]; then \ SCILAB_SWIGOPT += -addsources "$(SRCDIR_SRCS)" \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \ endif \
fi ifdef INCLUDES \
SCILAB_SWIGOPT += -addcflags "-I$(abspath $(INCLUDES))" \
endif \
ifdef SRCDIR \
SCILAB_SWIGOPT += -addcflags "-I$(abspath $(SRCDIR))" \
endif \
$(SWIG) -scilab -c++ $(SCILAB_SWIGOPT) $(SWIGOPT) $(INTERFACEPATH) \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Running a Scilab example # Running a Scilab example
# ----------------------------------------------------------------- # -----------------------------------------------------------------
scilab_run: scilab_run:
if [ -f $(RUNME) ]; then \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -f $(RUNME).sci $(RUNPIPE); \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -f $(RUNME).sci $(RUNPIPE); \
fi
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Scilab version # Scilab version