improved makefile now that rhrd-go is go-getable

8 files changed, 18 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
index fe326b0..bc88ec7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 bin/
 pkg/
 src/github.com
-src/helsinki.at
-src/.rhrd-go.prepared
+src/code.helsinki.at
diff --git a/Makefile b/Makefile
index 3b51297..e458673 100644
--- a/Makefile
+++ b/Makefile
@@ -27,35 +27,22 @@ GOCMD := GOPATH=$(curdir) go
 
 EXECUTEABLE := rhimportd
 
-LIBS := "github.com/vaughan0/go-ini" \
-        "github.com/ziutek/mymysql/godrv" \
-        "github.com/andelf/go-curl" \
+LIBS := "code.helsinki.at/rhrd-go/rddb" \
+        "code.helsinki.at/rhrd-go/rhimport" \
         "github.com/spreadspace/telgo" \
         "github.com/gorilla/websocket"
 
 
-.PHONY: getlibs build clean distclean _setenv
+.PHONY: getlibs updatelibs vet format build clean distclean
 all: build
 
 
-src/.rhrd-go.prepared:
-	@echo "fetching lib: helsinki.at/rhrd-go"
-	@cd src/; mkdir -p helsinki.at; cd helsinki.at; git clone git://git.helsinki.at/rhrd-go/ > /dev/null 2>&1
-	@touch $@
-
-getlibs: get-rhrd-go
+getlibs:
 	@$(foreach lib,$(LIBS), echo "fetching lib: $(lib)"; $(GOCMD) get $(lib);)
 
-get-rhrd-go: src/.rhrd-go.prepared
-
-updatelibs: update-rhrd-go
+updatelibs:
 	@$(foreach lib,$(LIBS), echo "updating lib: $(lib)"; $(GOCMD) get -u $(lib);)
 
-update-rhrd-go: src/.rhrd-go.prepared
-	@echo "updating lib: helsinki.at/rhrd-go"
-	@cd src/helsinki.at/rhrd-go; git pull > /dev/null 2>&1
-
-
 vet:
 	@echo "vetting: $(EXECUTEABLE)"
 	@$(GOCMD) vet $(EXECUTEABLE)
@@ -75,5 +62,4 @@ clean:
 
 distclean: clean
 	@$(foreach dir,$(shell ls src/),$(if $(subst $(EXECUTEABLE),,$(dir)),$(shell rm -rf src/$(dir))))
-	rm -f src/.rhrd-go.prepared
 	rm -rf pkg
diff --git a/src/rhimportd/ctrlTelnet.go b/src/rhimportd/ctrlTelnet.go
index 324d7c1..6e859e4 100644
--- a/src/rhimportd/ctrlTelnet.go
+++ b/src/rhimportd/ctrlTelnet.go
@@ -25,10 +25,10 @@
 package main
 
 import (
+	"code.helsinki.at/rhrd-go/rddb"
+	"code.helsinki.at/rhrd-go/rhimport"
 	"fmt"
 	"github.com/spreadspace/telgo"
-	"helsinki.at/rhrd-go/rddb"
-	"helsinki.at/rhrd-go/rhimport"
 	"net/http"
 	"strconv"
 	"strings"
diff --git a/src/rhimportd/ctrlWatchDir.go b/src/rhimportd/ctrlWatchDir.go
index d5cab31..7556f5d 100644
--- a/src/rhimportd/ctrlWatchDir.go
+++ b/src/rhimportd/ctrlWatchDir.go
@@ -25,10 +25,10 @@
 package main
 
 import (
+	"code.helsinki.at/rhrd-go/rddb"
+	"code.helsinki.at/rhrd-go/rhimport"
 	"encoding/json"
 	"fmt"
-	"helsinki.at/rhrd-go/rddb"
-	"helsinki.at/rhrd-go/rhimport"
 	"net/http"
 	"os"
 	"path/filepath"
diff --git a/src/rhimportd/ctrlWeb.go b/src/rhimportd/ctrlWeb.go
index 48724e4..40075d0 100644
--- a/src/rhimportd/ctrlWeb.go
+++ b/src/rhimportd/ctrlWeb.go
@@ -25,8 +25,8 @@
 package main
 
 import (
-	"helsinki.at/rhrd-go/rddb"
-	"helsinki.at/rhrd-go/rhimport"
+	"code.helsinki.at/rhrd-go/rddb"
+	"code.helsinki.at/rhrd-go/rhimport"
 	"net/http"
 	_ "net/http/pprof"
 	"time"
diff --git a/src/rhimportd/ctrlWebSimple.go b/src/rhimportd/ctrlWebSimple.go
index 2d58c2b..7c5e569 100644
--- a/src/rhimportd/ctrlWebSimple.go
+++ b/src/rhimportd/ctrlWebSimple.go
@@ -25,10 +25,10 @@
 package main
 
 import (
+	"code.helsinki.at/rhrd-go/rddb"
+	"code.helsinki.at/rhrd-go/rhimport"
 	"encoding/json"
 	"fmt"
-	"helsinki.at/rhrd-go/rddb"
-	"helsinki.at/rhrd-go/rhimport"
 	"html"
 	"net/http"
 )
diff --git a/src/rhimportd/ctrlWebSocket.go b/src/rhimportd/ctrlWebSocket.go
index 92fd89a..35b285b 100644
--- a/src/rhimportd/ctrlWebSocket.go
+++ b/src/rhimportd/ctrlWebSocket.go
@@ -25,10 +25,10 @@
 package main
 
 import (
+	"code.helsinki.at/rhrd-go/rddb"
+	"code.helsinki.at/rhrd-go/rhimport"
 	"fmt"
 	"github.com/gorilla/websocket"
-	"helsinki.at/rhrd-go/rddb"
-	"helsinki.at/rhrd-go/rhimport"
 	"html"
 	"math"
 	"net/http"
diff --git a/src/rhimportd/main.go b/src/rhimportd/main.go
index 73278aa..4b0514b 100644
--- a/src/rhimportd/main.go
+++ b/src/rhimportd/main.go
@@ -25,10 +25,10 @@
 package main
 
 import (
+	"code.helsinki.at/rhrd-go/rddb"
+	"code.helsinki.at/rhrd-go/rhimport"
 	"flag"
 	"fmt"
-	"helsinki.at/rhrd-go/rddb"
-	"helsinki.at/rhrd-go/rhimport"
 	"io/ioutil"
 	"log"
 	"os"