scilab: use TARGET in Examples Makefile

2014-07-03 12:13:49 +02:00 · 2014-07-03 12:13:49 +02:00 · d50620ddeb
commit d50620ddeb
parent a3eae4c014
15 changed files with 18 additions and 18 deletions
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@ -1719,9 +1719,9 @@ endif
 scilab: $(SRCDIR_SRCS)
 	@if test ! -z "$(SRCS)"; then \
 		test "$(SRCS)" = "$(SRCDIR_SRCS)" || cp $(SRCDIR_SRCS) . ; \
-		$(SWIG) -scilab $(SWIGOPT) -o $(ISRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" $(INTERFACEPATH); \
+		$(SWIG) -scilab $(SWIGOPT) -o $(ISRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" -outputlibrary $(TARGET) $(INTERFACEPATH); \
 	else \
-		$(SWIG) -scilab $(SWIGOPT) -o $(ISRCS) -addcflags "$(SRCDIR_INCLUDE)" $(INTERFACEPATH); \
+		$(SWIG) -scilab $(SWIGOPT) -o $(ISRCS) -addcflags "$(SRCDIR_INCLUDE)" -outputlibrary $(TARGET) $(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)
@ -1733,9 +1733,9 @@ scilab: $(SRCDIR_SRCS)
 scilab_cpp: $(SRCDIR_SRCS)
 	@if test ! -z "$(SRCS)"; then \
 		test "$(SRCS)" = "$(SRCDIR_SRCS)" || cp $(SRCDIR_SRCS) . ; \
-		$(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" $(INTERFACEPATH); \
+		$(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" -outputlibrary $(TARGET) $(INTERFACEPATH); \
 	else \
-		$(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) -addcflags "$(SRCDIR_INCLUDE)" $(INTERFACEPATH); \
+		$(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) -addcflags "$(SRCDIR_INCLUDE)" -outputlibrary $(TARGET) $(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)
--- a/Examples/scilab/class/Makefile
+++ b/Examples/scilab/class/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.cxx
-TARGET     = example_wrap.cxx
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/constants/Makefile
+++ b/Examples/scilab/constants/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       =
-TARGET     = example_wrap.c
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/contract/Makefile
+++ b/Examples/scilab/contract/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example_wrap.c
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/enum/Makefile
+++ b/Examples/scilab/enum/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example1.c
-TARGET     = example_wrap.c
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/funcptr/Makefile
+++ b/Examples/scilab/funcptr/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example_wrap.c
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/matrix/Makefile
+++ b/Examples/scilab/matrix/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example_wrap.c
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/matrix2/Makefile
+++ b/Examples/scilab/matrix2/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = matrixlib.c
-TARGET     = matrixlib_wrap.c
+TARGET     = matrixlib
 INTERFACE  = matrixlib.i

 check: build
--- a/Examples/scilab/pointer/Makefile
+++ b/Examples/scilab/pointer/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example_wrap.c
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/simple/Makefile
+++ b/Examples/scilab/simple/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example_wrap.c
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/std_list/Makefile
+++ b/Examples/scilab/std_list/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.cpp
-TARGET     = example_wrap.cxx
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/std_vector/Makefile
+++ b/Examples/scilab/std_vector/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       =
-TARGET     = example_wrap.cxx
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/struct/Makefile
+++ b/Examples/scilab/struct/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       =
-TARGET     = example_wrap.c
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/template/Makefile
+++ b/Examples/scilab/template/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.cxx
-TARGET     = example_wrap.cxx
+TARGET     = example
 INTERFACE  = example.i

 check: build
--- a/Examples/scilab/variables/Makefile
+++ b/Examples/scilab/variables/Makefile
@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example_wrap.c
+TARGET     = example
 INTERFACE  = example.i

 check: build