Python examples makefiles clean target fixed and use RUNPIPE and tidyup

35 files changed, 232 insertions, 275 deletions

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index fa459c5a2..94d4eecac 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -328,17 +328,17 @@ python_static_cpp: $(SRCS)
 # -----------------------------------------------------------------
 
 ifeq (,$(PY3))
-  PYSCRIPT = runme.py
+  PYSCRIPT = $(RUNME).py
 else
-  PYSCRIPT = runme3.py
+  PYSCRIPT = $(RUNME)3.py
 endif
 
 PY2TO3 = 2to3 `2to3 -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'`
 
-python_run: $(PYSCRIPT)
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(PYSCRIPT) >/dev/null
+python_run:
+	$(RUNTOOL) $(PYTHON) $(PYSCRIPT) $(RUNPIPE)
 
-runme3.py: runme.py
+$(RUNME)3.py: $(RUNME).py
 	cp $< $@
 	$(PY2TO3) -w $@ >/dev/null 2>&1
 
@@ -358,7 +358,8 @@ python_clean:
 	rm -f *_wrap* *~ .~* mypython@EXEEXT@ *.pyc
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@ *@PYTHON_SO@
-	if [ -f runme.py ]; then rm -f runme3.py runme3.py.bak; fi
+	rm -f $(TARGET).py
+	if [ -f $(RUNME).py ]; then rm -f $(RUNME)3.py $(RUNME)3.py.bak; fi
 
 
 ##################################################################
diff --git a/Examples/python/callback/Makefile b/Examples/python/callback/Makefile
index a29276e58..21e88adc5 100644
--- a/Examples/python/callback/Makefile
+++ b/Examples/python/callback/Makefile
@@ -6,17 +6,16 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/class/Makefile b/Examples/python/class/Makefile
index 74625b992..e940c1f43 100644
--- a/Examples/python/class/Makefile
+++ b/Examples/python/class/Makefile
@@ -5,17 +5,16 @@ TARGET     = example
 INTERFACE  = example.i
 LIBS       = -lm
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/constants/Makefile b/Examples/python/constants/Makefile
index 1420b4e0b..505f199de 100644
--- a/Examples/python/constants/Makefile
+++ b/Examples/python/constants/Makefile
@@ -4,17 +4,16 @@ SRCS       =
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/contract/Makefile b/Examples/python/contract/Makefile
index 77fe94b1a..a44887736 100644
--- a/Examples/python/contract/Makefile
+++ b/Examples/python/contract/Makefile
@@ -4,17 +4,17 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    = 
-all::
+
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/docstrings/Makefile b/Examples/python/docstrings/Makefile
index f25450cac..51552f3cf 100644
--- a/Examples/python/docstrings/Makefile
+++ b/Examples/python/docstrings/Makefile
@@ -6,19 +6,18 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = -O
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/enum/Makefile b/Examples/python/enum/Makefile
index 74625b992..e940c1f43 100644
--- a/Examples/python/enum/Makefile
+++ b/Examples/python/enum/Makefile
@@ -5,17 +5,16 @@ TARGET     = example
 INTERFACE  = example.i
 LIBS       = -lm
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/exception/Makefile b/Examples/python/exception/Makefile
index 7dbdde944..b2b163e2e 100644
--- a/Examples/python/exception/Makefile
+++ b/Examples/python/exception/Makefile
@@ -5,17 +5,16 @@ TARGET     = example
 INTERFACE  = example.i
 LIBS       = -lm
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/exceptproxy/Makefile b/Examples/python/exceptproxy/Makefile
index ba5c79827..06bce6543 100644
--- a/Examples/python/exceptproxy/Makefile
+++ b/Examples/python/exceptproxy/Makefile
@@ -6,17 +6,16 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/extend/Makefile b/Examples/python/extend/Makefile
index a29276e58..21e88adc5 100644
--- a/Examples/python/extend/Makefile
+++ b/Examples/python/extend/Makefile
@@ -6,17 +6,16 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/funcptr/Makefile b/Examples/python/funcptr/Makefile
index 0f4a1e077..df3bc86ff 100644
--- a/Examples/python/funcptr/Makefile
+++ b/Examples/python/funcptr/Makefile
@@ -4,17 +4,16 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/funcptr2/Makefile b/Examples/python/funcptr2/Makefile
index 0f4a1e077..df3bc86ff 100644
--- a/Examples/python/funcptr2/Makefile
+++ b/Examples/python/funcptr2/Makefile
@@ -4,17 +4,16 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/functor/Makefile b/Examples/python/functor/Makefile
index fe389757a..6ef158379 100644
--- a/Examples/python/functor/Makefile
+++ b/Examples/python/functor/Makefile
@@ -6,17 +6,16 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/import/Makefile b/Examples/python/import/Makefile
index 74d4f88cf..f63e12271 100644
--- a/Examples/python/import/Makefile
+++ b/Examples/python/import/Makefile
@@ -3,7 +3,10 @@ SWIG       = $(TOP)/../preinst-swig
 SWIGOPT    =
 LIBS       =
 
-all:: 
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
 	LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' python_cpp
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
@@ -14,9 +17,6 @@ all::
 	LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' python_cpp
 
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	@rm -f foo.py bar.py spam.py base.py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
+	rm -f foo.py bar.py spam.py base.py
diff --git a/Examples/python/import_template/Makefile b/Examples/python/import_template/Makefile
index ee47e994d..f63e12271 100644
--- a/Examples/python/import_template/Makefile
+++ b/Examples/python/import_template/Makefile
@@ -3,7 +3,10 @@ SWIG       = $(TOP)/../preinst-swig
 SWIGOPT    =
 LIBS       =
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
 	LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' python_cpp
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
@@ -14,9 +17,6 @@ all::
 	LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' python_cpp
 
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	@rm -f foo.py bar.py spam.py base.py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
+	rm -f foo.py bar.py spam.py base.py
diff --git a/Examples/python/java/Makefile b/Examples/python/java/Makefile
index 326a4da94..47b865dd1 100644
--- a/Examples/python/java/Makefile
+++ b/Examples/python/java/Makefile
@@ -5,20 +5,18 @@ TARGET     = example
 INTERFACE  = example.i
 LIBS       = -lm
 
-all:: Example.class
+check: build
+
+build: Example.class
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXX="gcj"  \
 	CXXSHARED="gcj -fpic -shared Example.class" DEFS='' LIBS="-lstdc++" python_cpp
 
-
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile python_clean
 	rm -f $(TARGET).py
 	rm -f *.class Example.h
 
-check: all
-
-
 Example.class: Example.java
 	gcj -fPIC -C -c -g Example.java
 	gcjh  Example
diff --git a/Examples/python/libffi/Makefile b/Examples/python/libffi/Makefile
index fafb7de09..e0620f62d 100644
--- a/Examples/python/libffi/Makefile
+++ b/Examples/python/libffi/Makefile
@@ -4,17 +4,16 @@ SRCS       =
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' LIBS='-L/usr/local/lib -lffi' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/multimap/Makefile b/Examples/python/multimap/Makefile
index 0f4a1e077..df3bc86ff 100644
--- a/Examples/python/multimap/Makefile
+++ b/Examples/python/multimap/Makefile
@@ -4,17 +4,16 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/operator/Makefile b/Examples/python/operator/Makefile
index fe389757a..6ef158379 100644
--- a/Examples/python/operator/Makefile
+++ b/Examples/python/operator/Makefile
@@ -6,17 +6,16 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/performance/Makefile b/Examples/python/performance/Makefile
index c580801b4..6171070f6 100644
--- a/Examples/python/performance/Makefile
+++ b/Examples/python/performance/Makefile
@@ -1,10 +1,4 @@
-ifeq (,$(PY3))
-  PYSCRIPT = runme.py
-else
-  PYSCRIPT = runme3.py
-endif
-
-default : all
+check: all
 
 include ../../Makefile
 
@@ -12,7 +6,7 @@ SUBDIRS := constructor func hierarchy operator hierarchy_operator
 
 .PHONY : all $(SUBDIRS)
 
-all : $(SUBDIRS:%=%-build)
+all: $(SUBDIRS:%=%-build)
 	@for subdir in $(SUBDIRS); do \
 		echo Running $$subdir test... ; \
 		echo -------------------------------------------------------------------------------- ; \
@@ -21,17 +15,17 @@ all : $(SUBDIRS:%=%-build)
 		cd ..; \
 	done
 
-$(SUBDIRS) :
+$(SUBDIRS):
 	$(MAKE) -C $@
 	@echo Running $$subdir test...
 	@echo --------------------------------------------------------------------------------
 	cd $@ && env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(PYSCRIPT)
 
-%-build :
+%-build:
 	$(MAKE) -C $*
 
-%-clean :
+%-clean:
 	$(MAKE) -s -C $* clean
 
-clean : $(SUBDIRS:%=%-clean)
+clean: $(SUBDIRS:%=%-clean)
 	rm -f *.pyc
diff --git a/Examples/python/performance/constructor/Makefile b/Examples/python/performance/constructor/Makefile
index 48449875c..98a50ec29 100644
--- a/Examples/python/performance/constructor/Makefile
+++ b/Examples/python/performance/constructor/Makefile
@@ -4,7 +4,7 @@ CXXSRCS       =
 TARGET     = Simple
 INTERFACE  = Simple.i
 
-all :
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \
 	TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \
@@ -12,10 +12,10 @@ all :
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
 	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
 
-static :
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean :
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
+	rm -f $(TARGET)_*.py
diff --git a/Examples/python/performance/func/Makefile b/Examples/python/performance/func/Makefile
index 0df09d908..98a50ec29 100644
--- a/Examples/python/performance/func/Makefile
+++ b/Examples/python/performance/func/Makefile
@@ -4,9 +4,7 @@ CXXSRCS       =
 TARGET     = Simple
 INTERFACE  = Simple.i
 
-default : all
-
-all :
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \
 	TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \
@@ -14,10 +12,10 @@ all :
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
 	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
 
-static :
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean :
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
+	rm -f $(TARGET)_*.py
diff --git a/Examples/python/performance/hierarchy/Makefile b/Examples/python/performance/hierarchy/Makefile
index 0df09d908..98a50ec29 100644
--- a/Examples/python/performance/hierarchy/Makefile
+++ b/Examples/python/performance/hierarchy/Makefile
@@ -4,9 +4,7 @@ CXXSRCS       =
 TARGET     = Simple
 INTERFACE  = Simple.i
 
-default : all
-
-all :
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \
 	TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \
@@ -14,10 +12,10 @@ all :
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
 	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
 
-static :
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean :
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
+	rm -f $(TARGET)_*.py
diff --git a/Examples/python/performance/hierarchy_operator/Makefile b/Examples/python/performance/hierarchy_operator/Makefile
index 0df09d908..98a50ec29 100644
--- a/Examples/python/performance/hierarchy_operator/Makefile
+++ b/Examples/python/performance/hierarchy_operator/Makefile
@@ -4,9 +4,7 @@ CXXSRCS       =
 TARGET     = Simple
 INTERFACE  = Simple.i
 
-default : all
-
-all :
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \
 	TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \
@@ -14,10 +12,10 @@ all :
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
 	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
 
-static :
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean :
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
+	rm -f $(TARGET)_*.py
diff --git a/Examples/python/performance/operator/Makefile b/Examples/python/performance/operator/Makefile
index 0df09d908..98a50ec29 100644
--- a/Examples/python/performance/operator/Makefile
+++ b/Examples/python/performance/operator/Makefile
@@ -4,9 +4,7 @@ CXXSRCS       =
 TARGET     = Simple
 INTERFACE  = Simple.i
 
-default : all
-
-all :
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \
 	TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \
@@ -14,10 +12,10 @@ all :
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
 	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
 
-static :
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean :
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
+	rm -f $(TARGET)_*.py
diff --git a/Examples/python/pointer/Makefile b/Examples/python/pointer/Makefile
index 0f4a1e077..df3bc86ff 100644
--- a/Examples/python/pointer/Makefile
+++ b/Examples/python/pointer/Makefile
@@ -4,17 +4,16 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/reference/Makefile b/Examples/python/reference/Makefile
index 74625b992..e940c1f43 100644
--- a/Examples/python/reference/Makefile
+++ b/Examples/python/reference/Makefile
@@ -5,17 +5,16 @@ TARGET     = example
 INTERFACE  = example.i
 LIBS       = -lm
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/simple/Makefile b/Examples/python/simple/Makefile
index 0f4a1e077..df3bc86ff 100644
--- a/Examples/python/simple/Makefile
+++ b/Examples/python/simple/Makefile
@@ -4,17 +4,16 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/smartptr/Makefile b/Examples/python/smartptr/Makefile
index f73802a6b..140d482c9 100644
--- a/Examples/python/smartptr/Makefile
+++ b/Examples/python/smartptr/Makefile
@@ -6,17 +6,16 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/std_map/Makefile b/Examples/python/std_map/Makefile
index 5d13da764..06bce6543 100644
--- a/Examples/python/std_map/Makefile
+++ b/Examples/python/std_map/Makefile
@@ -6,20 +6,16 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-run:
-	python runme.py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/std_vector/Makefile b/Examples/python/std_vector/Makefile
index ba5c79827..06bce6543 100644
--- a/Examples/python/std_vector/Makefile
+++ b/Examples/python/std_vector/Makefile
@@ -6,17 +6,16 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/swigrun/Makefile b/Examples/python/swigrun/Makefile
index 2142be5bb..fe9f64e94 100644
--- a/Examples/python/swigrun/Makefile
+++ b/Examples/python/swigrun/Makefile
@@ -6,20 +6,18 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(SWIG) -python -external-runtime
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
 	rm -f swigpyrun.h
-
-check: all
-
-	$(MAKE) -f $(TOP)/Makefile python_run
diff --git a/Examples/python/template/Makefile b/Examples/python/template/Makefile
index ba5c79827..06bce6543 100644
--- a/Examples/python/template/Makefile
+++ b/Examples/python/template/Makefile
@@ -6,17 +6,16 @@ INTERFACE  = example.i
 LIBS       = -lm
 SWIGOPT    = 
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/varargs/Makefile b/Examples/python/varargs/Makefile
index 1420b4e0b..505f199de 100644
--- a/Examples/python/varargs/Makefile
+++ b/Examples/python/varargs/Makefile
@@ -4,17 +4,16 @@ SRCS       =
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean
diff --git a/Examples/python/variables/Makefile b/Examples/python/variables/Makefile
index 0f4a1e077..df3bc86ff 100644
--- a/Examples/python/variables/Makefile
+++ b/Examples/python/variables/Makefile
@@ -4,17 +4,16 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+	$(MAKE) -f $(TOP)/Makefile python_run
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
-clean::
-	$(MAKE) -f $(TOP)/Makefile python_clean
-	rm -f $(TARGET).py
-
-check: all
-	$(MAKE) -f $(TOP)/Makefile python_run
+clean:
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean