Permalink
Browse files

scilab: simplify Examples makefile (removing INCLUDE stuff)

  • Loading branch information...
smarchetto committed Jul 3, 2014
1 parent 57b5eab commit d6cca41d3e3fcc08db23a2431f63c66f9b6c76c6
Showing with 6 additions and 23 deletions.
  1. +6 −22 Examples/Makefile.in
  2. +0 −1 Examples/test-suite/scilab/Makefile.in
View
@@ -1719,18 +1719,10 @@ endif
scilab: $(SRCDIR_SRCS)
@if test ! -z "$(SRCS)"; then \
test "$(SRCS)" = "$(SRCDIR_SRCS)" || cp $(SRCDIR_SRCS) . ; \
- if test ! -z "$(INCLUDES)"; then \
- $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
- else \
- $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" $(SWIGOPT) $(INTERFACEPATH); \
- fi \
+ $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" $(SWIGOPT) $(INTERFACEPATH); \
else \
- if test ! -z "$(INCLUDES)"; then \
- $(SWIG) -scilab -o $(ISRCS) -addcflags "$(SRCDIR_INCLUDE)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
- else \
- $(SWIG) -scilab -o $(ISRCS) -addcflags "$(SRCDIR_INCLUDE)" $(SWIGOPT) $(INTERFACEPATH); \
- fi \
- fi
+ $(SWIG) -scilab -o $(ISRCS) -addcflags "$(SRCDIR_INCLUDE)" $(SWIGOPT) $(INTERFACEPATH); \
+ fi; \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "ierr = exec('builder.sce', 'errcatch', -1); if ierr <> 0 then disp(lasterror()); end; exit(ierr);"; \
test "x$(SRCS)" = "x$(SRCDIR_SRCS)" || rm $(SRCS)
@@ -1741,18 +1733,10 @@ scilab: $(SRCDIR_SRCS)
scilab_cpp: $(SRCDIR_SRCS)
@if test ! -z "$(SRCS)"; then \
test "$(SRCS)" = "$(SRCDIR_SRCS)" || cp $(SRCDIR_SRCS) . ; \
- if test ! -z "$(INCLUDES)"; then \
- $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
- else \
- $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" $(SWIGOPT) $(INTERFACEPATH); \
- fi \
+ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" $(SWIGOPT) $(INTERFACEPATH); \
else \
- if test ! -z "$(INCLUDES)"; then \
- $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addcflags "$(SRCDIR_INCLUDE)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
- else \
- $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addcflags "$(SRCDIR_INCLUDE)" $(SWIGOPT) $(INTERFACEPATH); \
- fi \
- fi
+ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addcflags "$(SRCDIR_INCLUDE)" $(SWIGOPT) $(INTERFACEPATH); \
+ fi; \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "ierr = exec('builder.sce', 'errcatch', -1); if ierr <> 0 then disp(lasterror()); end; exit(ierr);"; \
test "x$(SRCS)" = "x$(SRCDIR_SRCS)" || rm $(SRCS)
@@ -30,7 +30,6 @@ include $(srcdir)/../common.mk
# Overriden variables
SRCDIR = ../$(srcdir)/
SCRIPTDIR = .
-INCLUDES = $(abspath $(srcdir)/..)
# Local variables
TEST_DIR = $*.dir

0 comments on commit d6cca41

Please sign in to comment.