improved makefile now that rhrd-go is go-getable

1 files changed, 5 insertions, 19 deletions

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