summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Harris <pharris@opentext.com>2011-01-07 13:20:18 -0500
committerPeter Harris <pharris@opentext.com>2011-01-07 13:55:39 -0500
commitd0fc38da09ec5790bbbb34849e73e93830cf2df3 (patch)
tree9d657b56069af0c392b3d157889467fa94cef53c
parent7bf3bc1fe4789d0c4d5d49ee34206f2504ab90a1 (diff)
Compile sub-packages into the correct location
-rw-r--r--Makefile7
-rw-r--r--xgob/util/atom.go2
-rw-r--r--xlsclients.go4
-rw-r--r--xmu.go4
4 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index bdad028..bb004c1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# How to compile a .go file
%.6: %.go
- 6g -I. $<
+ 6g -I. -o $@ $<
%: %.6
6l -L. -o $@ $<
@@ -13,7 +13,8 @@
all: test noop xlsclients
# Dependencies
-xgob/util/atom.6: xgob/xproto.6
+xgob/util/atom.6: xgob/xproto.6 xgob.6
+xmu.6: xgob/util/atom.6 xgob/xproto.6 xgob.6
test.6: xgob.6
-xlsclients.6: xgob.6 xmu.6 xgob/xproto.6 xgob/util/atom.6
noop.6: xgob.6
+xlsclients.6: xgob.6 xmu.6 xgob/xproto.6 xgob/util/atom.6
diff --git a/xgob/util/atom.go b/xgob/util/atom.go
index b5f47f8..4000e02 100644
--- a/xgob/util/atom.go
+++ b/xgob/util/atom.go
@@ -4,7 +4,7 @@ import (
"fmt"
"sync"
"xgob"
- "xproto"
+ "xgob/xproto"
)
type state struct {
diff --git a/xlsclients.go b/xlsclients.go
index ea76b3f..a67e171 100644
--- a/xlsclients.go
+++ b/xlsclients.go
@@ -1,14 +1,14 @@
package main
import (
- "atom"
"bytes"
"flag"
"fmt"
"strings"
"xgob"
+ "xgob/util/atom"
+ "xgob/xproto"
"xmu"
- "xproto"
)
var display = flag.String("display", "", "Display to connect to")
diff --git a/xmu.go b/xmu.go
index ea20614..bc2bf3e 100644
--- a/xmu.go
+++ b/xmu.go
@@ -1,9 +1,9 @@
package xmu
import (
- "atom"
"xgob"
- "xproto"
+ "xgob/util/atom"
+ "xgob/xproto"
)
/* The main difference between this and C/libXmu is that this version