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

Example makefile tidy up

Browse source
This commit is contained in:
William S Fulton 2013-08-30 22:13:18 +01:00
commit 9b51d7d869
5 changed files with 8 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Examples/Makefile.in
View file

@ -1583,7 +1583,7 @@ SCILAB_STARTOPT = @SCILABSTARTOPT@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab: $(SRCS) scilab: $(SRCS)
@if test ! -z "$(SRCS)"; then \ if test ! -z "$(SRCS)"; then \
if test ! -z "$(INCLUDES)"; then \ if test ! -z "$(INCLUDES)"; then \
$(SWIG) -scilab $(SWIGOPT) $(SCILABOPT) -addsrc $(SRCS) -addcflag $(INCLUDES) $(INTERFACEPATH); \ $(SWIG) -scilab $(SWIGOPT) $(SCILABOPT) -addsrc $(SRCS) -addcflag $(INCLUDES) $(INTERFACEPATH); \
else \ else \
@ -1596,8 +1596,8 @@ scilab: $(SRCS)
$(SWIG) -scilab $(SWIGOPT) $(SCILABOPT) $(INTERFACEPATH); \ $(SWIG) -scilab $(SWIGOPT) $(SCILABOPT) $(INTERFACEPATH); \
fi \ fi \
fi fi
@if [ -f builder.sce ]; then \ if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) $(SCILAB_STARTOPT) -f builder.sce; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' | $(RUNTOOL) $(SCILAB) $(SCILAB_STARTOPT) -f builder.sce; \
fi fi
# ---------------------------------------------------------------- # ----------------------------------------------------------------
@ -1605,7 +1605,7 @@ scilab: $(SRCS)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab_cpp: $(SRCS) scilab_cpp: $(SRCS)
@if test ! -z "$(SRCS)"; then \ if test ! -z "$(SRCS)"; then \
if test ! -z "$(INCLUDES)"; then \ if test ! -z "$(INCLUDES)"; then \
$(SWIG) -scilab -c++ $(SWIGOPT) $(SCILABOPT) -addsrc $(SRCS) -addcflag $(INCLUDES) $(INTERFACEPATH); \ $(SWIG) -scilab -c++ $(SWIGOPT) $(SCILABOPT) -addsrc $(SRCS) -addcflag $(INCLUDES) $(INTERFACEPATH); \
else \ else \
@ -1618,8 +1618,8 @@ scilab_cpp: $(SRCS)
$(SWIG) -scilab -c++ $(SWIGOPT) $(SCILABOPT) $(INTERFACEPATH); \ $(SWIG) -scilab -c++ $(SWIGOPT) $(SCILABOPT) $(INTERFACEPATH); \
fi \ fi \
fi fi
@if [ -f builder.sce ]; then \ if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) $(SCILAB_STARTOPT) -f builder.sce; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' | $(RUNTOOL) $(SCILAB) $(SCILAB_STARTOPT) -f builder.sce; \
fi fi
# ----------------------------------------------------------------- # -----------------------------------------------------------------
@ -1627,22 +1627,14 @@ scilab_cpp: $(SRCS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
scilab_run: scilab_run:
@env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH $(SCILAB) $(SCILAB_STARTOPT) -f runme.sci env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH $(RUNTOOL) $(SCILAB) $(SCILAB_STARTOPT) -f $(RUNME).sci
# -----------------------------------------------------------------
# Debugging a scilab example
# -----------------------------------------------------------------
scilab_debug:
@env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH $(SCILAB) $(SCILAB_STARTOPT) -f runme.sci
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Scilab version # Scilab version
# ----------------------------------------------------------------- # -----------------------------------------------------------------
scilab_version: scilab_version:
echo `$(SCILAB) -version|head -1|sed -e 's|Scilab version \"\(.*\)\"|\1|g'` echo `$(SCILAB) -version | head -1 | sed -e 's|Scilab version \"\(.*\)\"|\1|g'`
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Cleaning the scilab examples # Cleaning the scilab examples

3
Examples/scilab/std_list/Makefile
View file

@ -15,6 +15,3 @@ clean:
run: loader.sce run: loader.sce
$(MAKE) -f $(TOP)/Makefile scilab_run $(MAKE) -f $(TOP)/Makefile scilab_run
debug: loader.sce
$(MAKE) -f $(TOP)/Makefile scilab_debug

3
Examples/scilab/std_set/Makefile
View file

@ -15,6 +15,3 @@ clean:
check: loader.sce check: loader.sce
$(MAKE) -f $(TOP)/Makefile scilab_run $(MAKE) -f $(TOP)/Makefile scilab_run
debug: loader.sce
$(MAKE) -f $(TOP)/Makefile scilab_debug

3
Examples/scilab/std_vector/std_vector/Makefile
View file

@ -15,6 +15,3 @@ clean:
check: loader.sce check: loader.sce
$(MAKE) -f $(TOP)/Makefile scilab_run $(MAKE) -f $(TOP)/Makefile scilab_run
debug: loader.sce
$(MAKE) -f $(TOP)/Makefile scilab_debug

3
Examples/scilab/std_vector/std_vector_as_function_argument/Makefile
View file

@ -15,6 +15,3 @@ clean:
check: loader.sce check: loader.sce
$(MAKE) -f $(TOP)/Makefile scilab_run $(MAKE) -f $(TOP)/Makefile scilab_run
debug: loader.sce
$(MAKE) -f $(TOP)/Makefile scilab_debug