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

scilab: fix last commit

Browse source
This commit is contained in:
Simon Marchetto 2014-06-26 12:27:25 +02:00
commit d8399c9270
1 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Examples/Makefile.in
View file

@ -1705,22 +1705,23 @@ r_clean:
SCILAB = @SCILAB@ SCILAB = @SCILAB@
SCILAB_OPT = @SCILABOPT@ SCILAB_OPT = @SCILABOPT@
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
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# Build a C dynamically loadable module # Build a C dynamically loadable module
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab: $(SRCDIR_SRCS) scilab: $(SRCDIR_SRCS)
ifdef SRCS \ $(SWIG) -scilab $(SCILAB_SWIGOPT) $(SWIGOPT) $(INTERFACEPATH)
SCILAB_SWIGOPT += -addsources "$(SRCDIR_SRCS)" \
endif \
ifdef INCLUDES \
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))"; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
# ---------------------------------------------------------------- # ----------------------------------------------------------------
@ -1728,17 +1729,7 @@ scilab: $(SRCDIR_SRCS)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab_cpp: $(SRCDIR_SRCS) scilab_cpp: $(SRCDIR_SRCS)
SCILAB_SWIGOPT = \ $(SWIG) -scilab -c++ $(SCILAB_SWIGOPT) $(SWIGOPT) $(INTERFACEPATH)
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 \
$(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))"; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
# ----------------------------------------------------------------- # -----------------------------------------------------------------