all: draw2d/draw2d -> draw2d

Makefile

@@ -4,13 +4,13 @@
 all:	install test
 
 install:
-	cd draw2d && go install
-	cd draw2dgl && go install
+	go install
+	go install ./draw2dgl
 #	cd wingui && make install
 
 build:
-	cd draw2d && go build
-	cd draw2dgl && go build
+	go build
+	go build ./draw2dgl
 #	cd wingui && make build
 
 test:
@@ -23,9 +23,7 @@ test:
 	#cd cmd && go build testX11draw.go
 
 clean:
-	cd draw2d && go clean
-#	cd draw2dgl && make clean
-	cd cmd && go clean
+	go clean ./...
 #	cd wingui && make clean
 
 command:

cmd/gettingStarted.go

@@ -11,7 +11,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 )
 
 func saveToPngFile(filePath string, m image.Image) {

cmd/roundedrectgl.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/go-gl/gl/v2.1/gl"
 	"github.com/go-gl/glfw/v3.1/glfw"
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 	"github.com/llgcode/draw2d/draw2dgl"
 )
 

cmd/testX11draw.go

@@ -7,7 +7,7 @@ import (
 	"image"
 	"math"
 
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 )
 
 func main() {

cmd/testandroid.go

@@ -10,7 +10,7 @@ import (
 	"math"
 	"os"
 
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 )
 
 const (

cmd/testdraw2d.go

@@ -13,7 +13,7 @@ import (
 	"math"
 	"os"
 
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 )
 
 const (

cmd/testgopher.go

@@ -10,7 +10,7 @@ import (
 	"math"
 	"os"
 
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 )
 
 const (

cmd/testimage.go

@@ -10,7 +10,7 @@ import (
 	"math"
 	"os"
 
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 )
 
 func saveToPngFile(filePath string, m image.Image) {

curve/curve_test.go

@@ -11,7 +11,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/llgcode/draw2d/draw2d/raster"
+	"github.com/llgcode/draw2d/raster"
 )
 
 var (

draw2dgl/gc.go

@@ -8,7 +8,7 @@ import (
 
 	"code.google.com/p/freetype-go/freetype/raster"
 	"github.com/go-gl/gl/v2.1/gl"
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 )
 
 func init() {

issue23/issue23.go

@@ -10,7 +10,7 @@ import (
 	"math"
 	"os"
 
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 )
 
 func saveToPngFile(filePath string, m image.Image) {

raster/raster_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"code.google.com/p/freetype-go/freetype/raster"
-	"github.com/llgcode/draw2d/draw2d/curve"
+	"github.com/llgcode/draw2d/curve"
 )
 
 var flattening_threshold float64 = 0.5

wingui/wintestgdi/wintestgdi.go

@@ -15,7 +15,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/llgcode/draw2d/draw2d"
+	"github.com/llgcode/draw2d"
 	"github.com/llgcode/draw2d/wingui"
 	"github.com/llgcode/ps"
 )