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

Octave examples clean target fixed and makefiles use new RUNPIPE and general consistency tidyup

Browse source
This commit is contained in:
William S Fulton 2013-04-13 00:28:26 +01:00
commit 14a89fac86
17 changed files with 101 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Examples/Makefile.in
View file

@ -366,6 +366,8 @@ OCTAVE_CXX = $(DEFS) @OCTAVE_CPPFLAGS@ @OCTAVE_CXXFLAGS@
OCTAVE_DLNK = @OCTAVE_LDFLAGS@
OCTAVE_SO = @OCTAVE_SO@
OCTAVE_SCRIPT = $(RUNME).m
# ----------------------------------------------------------------
# Build a C dynamically loadable module
# Note: Octave requires C++ compiler when compiling C wrappers
@ -390,10 +392,8 @@ octave_cpp: $(SRCS)
# Running an Octave example
# -----------------------------------------------------------------
OCTSCRIPT = runme.m
octave_run: $(OCTSCRIPT)
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH OCTAVE_PATH=$(srcdir):$$OCTAVE_PATH $(OCTAVE) $(OCTSCRIPT) >/dev/null
octave_run:
$(RUNTOOL) $(OCTAVE) $(OCTAVE_SCRIPT) $(RUNPIPE)
# -----------------------------------------------------------------
# Version display
@ -403,7 +403,7 @@ octave_version:
$(OCTAVE) --version | grep -i version
# -----------------------------------------------------------------
# Cleaning the octave examples
# Cleaning the Octave examples
# -----------------------------------------------------------------
octave_clean:

13
Examples/octave/callback/Makefile
View file

@ -6,17 +6,16 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/class/Makefile
View file

@ -6,17 +6,16 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/constants/Makefile
View file

@ -6,17 +6,16 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/contract/Makefile
View file

@ -4,17 +4,16 @@ SRCS = example.c
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
static::
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/enum/Makefile
View file

@ -6,17 +6,16 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/extend/Makefile
View file

@ -6,17 +6,16 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/funcptr/Makefile
View file

@ -4,17 +4,16 @@ SRCS = example.c
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
static::
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/funcptr2/Makefile
View file

@ -4,17 +4,16 @@ SRCS = example.c
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
static::
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/functor/Makefile
View file

@ -6,17 +6,16 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

12
Examples/octave/module_load/Makefile
View file

@ -4,19 +4,19 @@ SRCS = example.c
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' SWIGOPT='-module $$(TARGET)' INTERFACE='$(INTERFACE)' octave
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)2' SWIGOPT='-module $$(TARGET) -globals .' INTERFACE='$(INTERFACE)' octave
static::
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).m
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/operator/Makefile
View file

@ -6,17 +6,16 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).m
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/pointer/Makefile
View file

@ -4,17 +4,16 @@ SRCS = example.c
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
static::
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/reference/Makefile
View file

@ -6,17 +6,16 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/simple/Makefile
View file

@ -4,17 +4,16 @@ SRCS = example.c
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
static::
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/template/Makefile
View file

@ -6,17 +6,16 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

13
Examples/octave/variables/Makefile
View file

@ -4,17 +4,16 @@ SRCS = example.c
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile octave_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
static::
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile octave_clean
rm -f $(TARGET).py
check: all
$(MAKE) -f $(TOP)/Makefile octave_run