Fix build errors and add default build step to "make".

Makefile

@@ -15,7 +15,7 @@ TEST_ARTIFACTS = prometheus search_index
 
 include Makefile.INCLUDE
 
-all: test
+all: binary test
 
 advice:
 	go tool vet .

main.go

@@ -19,7 +19,6 @@ import (
 	"github.com/prometheus/prometheus/retrieval"
 	"github.com/prometheus/prometheus/retrieval/format"
 	"github.com/prometheus/prometheus/rules"
-	"github.com/prometheus/prometheus/rules/ast"
 	"github.com/prometheus/prometheus/storage/metric"
 	"github.com/prometheus/prometheus/web"
 	"github.com/prometheus/prometheus/web/api"

web/status.go

@@ -32,12 +32,12 @@ type PrometheusStatus struct {
 }
 
 type StatusHandler struct {
+	sync.Mutex
 	BuildInfo        map[string]string
 	Config           *config.Config
 	CurationState    chan metric.CurationState
 	PrometheusStatus *PrometheusStatus
 	TargetManager    retrieval.TargetManager
-	mutex            sync.Mutex
 }
 
 func (h *StatusHandler) ServeRequestsForever() {