build.sh in perfmonger-0.12.1

- old
+ new

@@ -1,9 +1,8 @@
 #!/bin/bash
 
-READLINK=$(type -p greadlink readlink | head -1)
-cd $(dirname $($READLINK -f $0))
+cd $(cd $(dirname $0); pwd)
 
 if [[ $1 = "-" ]]; then
     # do self build
     case `uname -s` in
         (Linux)
@@ -31,20 +30,19 @@
     TARGET=("linux amd64"  "darwin amd64")
 fi
 
 set -e
 
-GO_DEPS=$(ls subsystem/*.go; ls utils.go)
+GO_DEPS=$(ls subsystem/*.go utils.go)
 
 makefile=`mktemp`
 
 cat <<EOF > $makefile
 # DO NOT EDIT MANUALLY
 # generated by build.sh
 
 GO_DEPS := $(echo ${GO_DEPS})
-GO_SRC := utils.go
 
 .PHONY: all build clean
 
 all: build
 
@@ -60,11 +58,11 @@
     for subcmd in recorder player viewer summarizer plot-formatter; do
         TARGETS+=(../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH})
 
         cat <<EOF >> $makefile
 
-../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH}: perfmonger-${subcmd}.go \$(GO_DEPS)
-	go build -o \$@ perfmonger-$subcmd.go \$(GO_SRC)
+../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH}: cmd/perfmonger-${subcmd}/perfmonger-${subcmd}.go \$(GO_DEPS)
+	cd cmd/perfmonger-${subcmd} && go build -o ../../\$@ perfmonger-$subcmd.go
 
 EOF
     done
 
     # go build -o ../lib/exec/perfmonger-recorder_${var_GOOS}_${var_GOARCH} \