Fixes to Octave examples

- rename example modules from "example" to "swigexample", to avoid a
  warning from shadowing the Octave built-in function "example"
- remove deprecated "static" Makefile targets: there is no longer
  an option to build static Octave modules in the Examples Makefile
- emacs whitespace cleanup run on all files
This commit is contained in:
Karl Wette 2013-05-08 22:43:49 +02:00 • committed by william
commit c28d0c6c80
63 changed files with 211 additions and 345 deletions

View file

@ -1,7 +1,7 @@
TOP = ../..
SWIG = $(TOP)/../preinst-swig
SRCS = example.c
TARGET = example
TARGET = swigexample
INTERFACE = example.i
check: build
@ -11,9 +11,5 @@ build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean

View file

@ -19,5 +19,3 @@ int fact(int n) {
if (n <= 0) return 1;
return n*fact(n-1);
}

View file

@ -1,5 +1,5 @@
/* File : example.i */
%module example
%module swigexample
%contract gcd(int x, int y) {
require:

View file

@ -1,22 +1,21 @@
# file: runme.m
example
swigexample
# Call our gcd() function
x = 42;
y = 105;
g = example.gcd(x,y);
g = swigexample.gcd(x,y);
printf("The gcd of %d and %d is %d\n",x,y,g);
# Manipulate the Foo global variable
# Output its current value
printf("Foo = %f\n", example.cvar.Foo);
printf("Foo = %f\n", swigexample.cvar.Foo);
# Change its value
example.cvar.Foo = 3.1415926;
swigexample.cvar.Foo = 3.1415926;
# See if the change took effect
printf("Foo = %f\n", example.cvar.Foo);
printf("Foo = %f\n", swigexample.cvar.Foo);