Update for Go 1.2 release. Add support for linking SWIG code directly

into executable, rather than using a shared library.

22 files changed, 22 insertions, 22 deletions

diff --git a/Examples/go/callback/Makefile b/Examples/go/callback/Makefile
index 7489f87dc..4516d2674 100644
--- a/Examples/go/callback/Makefile
+++ b/Examples/go/callback/Makefile
@@ -1,12 +1,12 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-CXXSRCS    = example.cxx
+CXXSRCS    = callback.cxx
 TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run_cpp
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/callback/example.cxx b/Examples/go/callback/callback.cxx
index 450d75608..450d75608 100644
--- a/Examples/go/callback/example.cxx
+++ b/Examples/go/callback/callback.cxx
diff --git a/Examples/go/class/Makefile b/Examples/go/class/Makefile
index a099654f1..66b2df325 100644
--- a/Examples/go/class/Makefile
+++ b/Examples/go/class/Makefile
@@ -1,12 +1,12 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-CXXSRCS    = example.cxx
+CXXSRCS    = class.cxx
 TARGET     = example
 INTERFACE  = example.i
 LIBS       = -lm
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run_cpp
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/class/example.cxx b/Examples/go/class/class.cxx
index 1e8e203dd..1e8e203dd 100644
--- a/Examples/go/class/example.cxx
+++ b/Examples/go/class/class.cxx
diff --git a/Examples/go/constants/Makefile b/Examples/go/constants/Makefile
index b45feb963..c232e9ed1 100644
--- a/Examples/go/constants/Makefile
+++ b/Examples/go/constants/Makefile
@@ -6,7 +6,7 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/enum/Makefile b/Examples/go/enum/Makefile
index 7489f87dc..6f9347ca8 100644
--- a/Examples/go/enum/Makefile
+++ b/Examples/go/enum/Makefile
@@ -1,12 +1,12 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-CXXSRCS    = example.cxx
+CXXSRCS    = enum.cxx
 TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run_cpp
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/enum/example.cxx b/Examples/go/enum/enum.cxx
index df7bb6328..df7bb6328 100644
--- a/Examples/go/enum/example.cxx
+++ b/Examples/go/enum/enum.cxx
diff --git a/Examples/go/extend/Makefile b/Examples/go/extend/Makefile
index 7489f87dc..386d4d0bb 100644
--- a/Examples/go/extend/Makefile
+++ b/Examples/go/extend/Makefile
@@ -1,12 +1,12 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-CXXSRCS    = example.cxx
+CXXSRCS    = extend.cxx
 TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run_cpp
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/extend/example.cxx b/Examples/go/extend/extend.cxx
index 450d75608..450d75608 100644
--- a/Examples/go/extend/example.cxx
+++ b/Examples/go/extend/extend.cxx
diff --git a/Examples/go/funcptr/Makefile b/Examples/go/funcptr/Makefile
index 452ea2118..2c32c45fc 100644
--- a/Examples/go/funcptr/Makefile
+++ b/Examples/go/funcptr/Makefile
@@ -1,12 +1,12 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-SRCS       = example.c
+SRCS       = funcptr.c
 TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/funcptr/example.c b/Examples/go/funcptr/funcptr.c
index 5c4a3dabf..5c4a3dabf 100644
--- a/Examples/go/funcptr/example.c
+++ b/Examples/go/funcptr/funcptr.c
diff --git a/Examples/go/multimap/Makefile b/Examples/go/multimap/Makefile
index 452ea2118..0c5ec395f 100644
--- a/Examples/go/multimap/Makefile
+++ b/Examples/go/multimap/Makefile
@@ -1,12 +1,12 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-SRCS       = example.c
+SRCS       = multimap.c
 TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/multimap/example.c b/Examples/go/multimap/multimap.c
index b8360fa8a..b8360fa8a 100644
--- a/Examples/go/multimap/example.c
+++ b/Examples/go/multimap/multimap.c
diff --git a/Examples/go/pointer/Makefile b/Examples/go/pointer/Makefile
index 452ea2118..12e94f939 100644
--- a/Examples/go/pointer/Makefile
+++ b/Examples/go/pointer/Makefile
@@ -1,12 +1,12 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-SRCS       = example.c
+SRCS       = pointer.c
 TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/pointer/example.c b/Examples/go/pointer/pointer.c
index b877d9a5b..b877d9a5b 100644
--- a/Examples/go/pointer/example.c
+++ b/Examples/go/pointer/pointer.c
diff --git a/Examples/go/reference/Makefile b/Examples/go/reference/Makefile
index 7489f87dc..5c5e6808b 100644
--- a/Examples/go/reference/Makefile
+++ b/Examples/go/reference/Makefile
@@ -1,12 +1,12 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-CXXSRCS    = example.cxx
+CXXSRCS    = reference.cxx
 TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run_cpp
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/reference/example.cxx b/Examples/go/reference/reference.cxx
index 8a513bf49..8a513bf49 100644
--- a/Examples/go/reference/example.cxx
+++ b/Examples/go/reference/reference.cxx
diff --git a/Examples/go/simple/Makefile b/Examples/go/simple/Makefile
index 75f81bffe..907da8821 100644
--- a/Examples/go/simple/Makefile
+++ b/Examples/go/simple/Makefile
@@ -1,11 +1,11 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-SRCS       = example.c
+SRCS       = simple.c
 TARGET     = example
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/simple/example.c b/Examples/go/simple/simple.c
index 1c2af789c..1c2af789c 100644
--- a/Examples/go/simple/example.c
+++ b/Examples/go/simple/simple.c
diff --git a/Examples/go/template/Makefile b/Examples/go/template/Makefile
index 9ee030479..20ffb7136 100644
--- a/Examples/go/template/Makefile
+++ b/Examples/go/template/Makefile
@@ -6,7 +6,7 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run_cpp
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/variables/Makefile b/Examples/go/variables/Makefile
index 452ea2118..1f144929c 100644
--- a/Examples/go/variables/Makefile
+++ b/Examples/go/variables/Makefile
@@ -1,12 +1,12 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-SRCS       = example.c
+SRCS       = variables.c
 TARGET     = example
 INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/go/variables/example.c b/Examples/go/variables/variables.c
index 05e17c8c5..05e17c8c5 100644
--- a/Examples/go/variables/example.c
+++ b/Examples/go/variables/variables.c