updated to new names/urls

Makefile

@@ -1,28 +1,31 @@
 VERSION := $(shell git rev-parse --short HEAD)
-BUILDTIME := $(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
 BUILDUSER := $(shell whoami)
 BUILDHOST := $(shell hostname -s)
 BUILDARCH := $(shell uname -m)
 
 GOLDFLAGS += -X main.Version=$(VERSION)
-GOLDFLAGS += -X main.Buildtime=$(BUILDTIME)
 GOLDFLAGS += -X main.Builduser=$(BUILDUSER)@$(BUILDHOST)
 GOLDFLAGS += -X main.Buildarch=$(BUILDARCH)
 GOFLAGS = -ldflags "$(GOLDFLAGS)"
 
+FN := sircd
+
 default: rundebug
 
 rundebug: build
-	DEBUG=1 ./ircd
+	DEBUG=1 ./$(FN)
 
 run: build
-	./ircd
+	./$(FN)
 
-build: ./ircd
+build: $(FN)
 
-./ircd: *.go */*.go
-	go build -o $@ $(GOFLAGS) .
+go-get:
+	cd cmd/$(FN) && go get -v
+
+./$(FN): */*.go cmd/*/*.go go-get
+	cd cmd/$(FN) && go build -o ../../$(FN) $(GOFLAGS) .
 
 fmt:
-	go fmt *.go
-	go fmt sircd/*.go
+	go fmt */*.go
+	go fmt cmd/$(FN)/*.go