more go bits

diff --git a/tclpkg/gv/go/src/makefile b/tclpkg/gv/go/src/makefile
index 97d89b3dd44de1daaf81665f1c9690d256384344..444d5745c0c2eb2e1c3915aa386bd5d71a43ddd2 100644 (file)
--- a/tclpkg/gv/go/src/makefile
+++ b/tclpkg/gv/go/src/makefile
@@ -1,15 +1,17 @@
 GO=$(GOROOT)/bin/go
 
 test: test.go prep
-       $(GO) build -x -work -ldflags='-extldflags=/usr/lib64/libgvc.so' test.go
+       $(GO) build -work -gccgoflags '-lgvc' -compiler gccgo test.go
 
 .PHONY: prep
 prep:
        mkdir -p gv
        sed -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' <../../gv.i >gv/gv.swigcxx
+       sed -e 's/#include <gvc.h>/#include <graphviz\/gvc.h>/' <../../gv_dummy_init.c >gv/gv_dummy_init.c
+       sed -e 's/#include "gvplugin.h"/#include <graphviz\/gvplugin.h>/' <../../gv_builtins.c >gv/gv_builtins.c
        sed -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' \
                -e 's/DEMAND_LOADING/1/' <../../gv.cpp >gv/gv.cpp
        echo "package gv" >gv/gv.go
 
 clean:
-       rm -rf test gv
+       rm -rf test gv /tmp/go-build*