]> Cypherpunks.ru repositories - govpn.git/commitdiff
Separate BSD and old GNU Makes related part
authorSergey Matveev <stargrave@stargrave.org>
Wed, 13 May 2015 08:42:18 +0000 (11:42 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Wed, 13 May 2015 08:42:18 +0000 (11:42 +0300)
Current Makefile can be used with BSD Make and GNU Make 4.x. Old GNU
Make versions does not work. Separate that dependent parts to two
Makefiles: one for BSD Make, other for GNU Make >=3.x.

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
BSDmakefile [new file with mode: 0644]
GNUmakefile [new file with mode: 0644]
Makefile [deleted file]

diff --git a/BSDmakefile b/BSDmakefile
new file mode 100644 (file)
index 0000000..b57abb4
--- /dev/null
@@ -0,0 +1,4 @@
+GOPATH != pwd
+VERSION != cat VERSION
+
+include common.mk
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644 (file)
index 0000000..79efdfc
--- /dev/null
@@ -0,0 +1,4 @@
+GOPATH = $(shell pwd)
+VERSION = $(shell cat VERSION)
+
+include common.mk
diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 0670d39..0000000
--- a/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-GOPATH != pwd
-VERSION != cat VERSION
-
-LDFLAGS = -X govpn.Version $(VERSION)
-PREFIX ?= /usr/local
-BINDIR = $(DESTDIR)$(PREFIX)/bin
-INFODIR = $(DESTDIR)$(PREFIX)/info
-SHAREDIR = $(DESTDIR)$(PREFIX)/share/govpn
-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-server: depends
-       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-server
-
-govpn-verifier: depends
-       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-verifier
-
-bench:
-       cd src/govpn ; GOPATH=$(GOPATH) GOMAXPROC=2 go test -bench .
-
-clean:
-       rm -f govpn-client govpn-server govpn-verifier
-
-doc:
-       $(MAKE) -C doc
-
-install: all doc
-       mkdir -p $(BINDIR)
-       cp -f govpn-client govpn-server govpn-verifier $(BINDIR)
-       chmod 755 $(BINDIR)/govpn-client $(BINDIR)/govpn-server $(BINDIR)/govpn-verifier
-       mkdir -p $(INFODIR)
-       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
-       mkdir -p $(DOCDIR)
-       cp -f -L AUTHORS INSTALL NEWS README THANKS $(DOCDIR)
-       chmod 644 $(DOCDIR)/AUTHORS $(DOCDIR)/INSTALL $(DOCDIR)/NEWS $(DOCDIR)/README $(DOCDIR)/THANKS
-
-install-strip: install
-       strip $(BINDIR)/govpn-client $(BINDIR)/govpn-server $(BINDIR)/govpn-verifier