scilab: use swig -o option in Examples makefile

This commit is contained in:
Simon Marchetto 2014-06-27 15:25:52 +02:00
commit ad26af6eee

View file

@ -1713,33 +1713,33 @@ scilab: $(SRCDIR_SRCS)
if test ! -z "$(SRCS)"; then \
if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
$(SWIG) -scilab -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
fi \
else \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
$(SWIG) -scilab -addsources "$(SRCDIR_SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
fi \
fi \
else \
if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
$(SWIG) -scilab -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
fi \
else \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
$(SWIG) -scilab $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) $(SWIGOPT) $(INTERFACEPATH); \
fi \
fi \
fi
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "disp(pwd()); disp(ls()); exit(exec('builder.sce', 'errcatch', 3))"; \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "disp(ls()); exit(exec('builder.sce', 'errcatch', 3))"; \
# ----------------------------------------------------------------
# Build a C++ dynamically loadable module
@ -1749,29 +1749,29 @@ scilab_cpp: $(SRCDIR_SRCS)
if test ! -z "$(SRCS)"; then \
if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -c++ -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
$(SWIG) -scilab -c++ -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
fi \
else \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -c++ -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
$(SWIG) -scilab -c++ -addsources "$(SRCDIR_SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCDIR_SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
fi \
fi \
else \
if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -c++ -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
$(SWIG) -scilab -c++ -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
fi \
else \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -c++ -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
$(SWIG) -scilab -c++ $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) $(SWIGOPT) $(INTERFACEPATH); \
fi \
fi \
fi