Revert "scilab: in Examples makefile use relative path for additional sources"

This reverts commit 24cc827105.
This commit is contained in:
Simon Marchetto 2014-06-27 15:49:00 +02:00
commit 58a53d3a05

View file

@ -1713,15 +1713,15 @@ scilab: $(SRCDIR_SRCS)
if test ! -z "$(SRCS)"; then \
if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(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 -o $(ISRCS) -addsources "$(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 -o $(ISRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
fi \
fi \
else \
@ -1749,15 +1749,15 @@ scilab_cpp: $(SRCDIR_SRCS)
if test ! -z "$(SRCS)"; then \
if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(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++ -o $(ICXXSRCS) -addsources "$(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++ -o $(ICXXSRCS) -addsources "$(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++ -o $(ICXXSRCS) -addsources "$(SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
$(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCDIR_SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
fi \
fi \
else \