Example makefile tidy up for Scilab

This commit is contained in:
William S Fulton 2014-06-19 20:12:41 +01:00
commit 37c411958e

View file

@ -1706,18 +1706,18 @@ SCILAB_LIB = @SCILABLIB@
SCILAB = @SCILAB@
SCILAB_OPT = @SCILABOPT@
# Returns the Swig Scilab command line args
# Returns the SWIG Scilab command line args
define get_swig_scilab_args
SWIG_SCILAB_ARGS := -scilab
ifdef SRCS
SWIG_SCILAB_ARGS += -addsources "$(SRCDIR_SRCS)"
endif
ifdef INCLUDES
SWIG_SCILAB_ARGS += -addcflags "-I$(abspath $(INCLUDES))"
endif
ifdef SRCDIR
SWIG_SCILAB_ARGS += -addcflags "-I$(abspath $(SRCDIR))"
endif
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
# ----------------------------------------------------------------
@ -1726,7 +1726,7 @@ endef
scilab: $(SRCDIR_SRCS)
$(eval $(call get_swig_scilab_args))
$(SWIG) $(SWIGOPT) $(SWIG_SCILAB_ARGS) $(INTERFACEPATH)
$(SWIG) -scilab $(SCILAB_SWIGOPT) $(SWIGOPT) $(INTERFACEPATH)
if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
fi
@ -1737,7 +1737,7 @@ scilab: $(SRCDIR_SRCS)
scilab_cpp: $(SRCDIR_SRCS)
$(eval $(call get_swig_scilab_args))
$(SWIG) $(SWIGOPT) -c++ $(SWIG_SCILAB_ARGS) $(INTERFACEPATH)
$(SWIG) -scilab -c++ $(SCILAB_SWIGOPT) $(SWIGOPT) $(INTERFACEPATH)
if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
fi