X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=common.mk;h=988964fdd09892feaf487460efc952847abeb682;hb=b772182c156a0eab0798d12ca196610ac736035e;hp=b2f01fe169577de58d7bfeae0ce8ab87d68e3f24;hpb=a1e46f57b978e4660dfeb4b895a63f9c58b110ba;p=govpn.git

diff --git a/common.mk b/common.mk
index b2f01fe..988964f 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,6 @@
-LDFLAGS = -X govpn.Version $(VERSION)
+.PHONY: doc
+
+LDFLAGS = -X cypherpunks.ru/govpn.Version=$(VERSION)
 PREFIX ?= /usr/local
 BINDIR = $(DESTDIR)$(PREFIX)/bin
 INFODIR = $(DESTDIR)$(PREFIX)/info
@@ -7,20 +9,17 @@ DOCDIR = $(DESTDIR)$(PREFIX)/share/doc/govpn
 
 all: govpn-client govpn-server govpn-verifier
 
-depends:
-	$(MAKE) -C src
-
-govpn-client: depends
-	GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-client
+govpn-client:
+	GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-client
 
-govpn-server: depends
-	GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-server
+govpn-server:
+	GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-server
 
-govpn-verifier: depends
-	GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-verifier
+govpn-verifier:
+	GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-verifier
 
 bench:
-	cd src/govpn ; GOPATH=$(GOPATH) GOMAXPROC=2 go test -bench .
+	GOPATH=$(GOPATH) go test -benchmem -bench . cypherpunks.ru/govpn/...
 
 clean:
 	rm -f govpn-client govpn-server govpn-verifier
@@ -36,11 +35,14 @@ install: all doc
 	cp -f doc/govpn.info $(INFODIR)
 	chmod 644 $(INFODIR)/govpn.info
 	mkdir -p $(SHAREDIR)
-	cp -f utils/newclient.sh utils/storekey.sh $(SHAREDIR)
-	chmod 755 $(SHAREDIR)/newclient.sh $(SHAREDIR)/storekey.sh
+	cp -f utils/newclient.sh $(SHAREDIR)
+	chmod 755 $(SHAREDIR)/newclient.sh
 	mkdir -p $(DOCDIR)
-	cp -f -L AUTHORS INSTALL NEWS README THANKS $(DOCDIR)
-	chmod 644 $(DOCDIR)/AUTHORS $(DOCDIR)/INSTALL $(DOCDIR)/NEWS $(DOCDIR)/README $(DOCDIR)/THANKS
+	cp -f -L AUTHORS INSTALL NEWS NEWS.RU README README.RU THANKS $(DOCDIR)
+	chmod 644 $(DOCDIR)/*
 
 install-strip: install
 	strip $(BINDIR)/govpn-client $(BINDIR)/govpn-server $(BINDIR)/govpn-verifier
+
+dist:
+	./utils/makedist.sh $(VERSION)