Skip to content

Commit

Permalink
scilab: test fix example contract by copying first sources in current…
Browse files Browse the repository at this point in the history
… dir
  • Loading branch information
Simon Marchetto committed Jul 2, 2014
1 parent fa405fa commit 98f4668
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions Examples/Makefile.in
Expand Up @@ -1711,17 +1711,18 @@ SCILAB_OPT = @SCILABOPT@


scilab: $(SRCDIR_SRCS) scilab: $(SRCDIR_SRCS)
if test ! -z "$(SRCS)"; then \ if test ! -z "$(SRCS)"; then \
cp $(SRCDIR_SRCS) . ; \
if test ! -z "$(INCLUDES)"; then \ if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \ if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(abspath $(SRCDIR_SRCS))" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \ $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \ else \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(abspath $(SRCDIR_SRCS))" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \ $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
fi \ fi \
else \ else \
if test ! -z "$(SRCDIR)"; then \ if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(abspath $(SRCDIR_SRCS))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \ $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \ else \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(abspath $(SRCDIR_SRCS))" $(SWIGOPT) $(INTERFACEPATH); \ $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
fi \ fi \
fi \ fi \
else \ else \
Expand All @@ -1740,24 +1741,26 @@ scilab: $(SRCDIR_SRCS)
fi \ fi \
fi fi
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "ierr = exec('builder.sce', 'errcatch', 3); if ierr <> 0 then disp(lasterror()); end; exit(ierr);"; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "ierr = exec('builder.sce', 'errcatch', 3); if ierr <> 0 then disp(lasterror()); end; exit(ierr);"; \
rm $(SRCS)


# ---------------------------------------------------------------- # ----------------------------------------------------------------
# Build a C++ dynamically loadable module # Build a C++ dynamically loadable module
# ---------------------------------------------------------------- # ----------------------------------------------------------------


scilab_cpp: $(SRCDIR_SRCS) scilab_cpp: $(SRCDIR_SRCS)
if test ! -z "$(SRCS)"; then \ if test ! -z "$(SRCS)"; then \
cp $(SRCDIR_SRCS) . ; \
if test ! -z "$(INCLUDES)"; then \ if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \ if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(abspath $(SRCDIR_SRCS))" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \ else \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(abspath $(SRCDIR_SRCS))" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
fi \ fi \
else \ else \
if test ! -z "$(SRCDIR)"; then \ if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(abspath $(SRCDIR_SRCS))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \ else \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(abspath $(SRCDIR_SRCS))" $(SWIGOPT) $(INTERFACEPATH); \ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
fi \ fi \
fi \ fi \
else \ else \
Expand All @@ -1776,6 +1779,7 @@ scilab_cpp: $(SRCDIR_SRCS)
fi \ fi \
fi fi
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "ierr = exec('builder.sce', 'errcatch', 3); if ierr <> 0 then disp(lasterror()); end; exit(ierr);"; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "ierr = exec('builder.sce', 'errcatch', 3); if ierr <> 0 then disp(lasterror()); end; exit(ierr);"; \
rm $(SRCS)


# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Running a Scilab example # Running a Scilab example
Expand Down

0 comments on commit 98f4668

Please sign in to comment.