From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 23 Nov 2019 10:35:22 +0000 (+0300)
Subject: Combine {BSD,GNU}makefiles together, as GNU Make 4.0 supports != assignment
X-Git-Tag: v4.2.1~3
X-Git-Url: http://www.git.cypherpunks.ru/?p=gogost.git;a=commitdiff_plain;h=59c008f98eff598d825ee43ffed7ec57a277c062;hp=e6fb451e42301b28e4d0263c6d97736226aa9ca7

Combine {BSD,GNU}makefiles together, as GNU Make 4.0 supports != assignment
---

diff --git a/BSDmakefile b/BSDmakefile
deleted file mode 100644
index b57abb4..0000000
--- a/BSDmakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-GOPATH != pwd
-VERSION != cat VERSION
-
-include common.mk
diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
index 79efdfc..0000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-GOPATH = $(shell pwd)
-VERSION = $(shell cat VERSION)
-
-include common.mk
diff --git a/common.mk b/Makefile
similarity index 89%
rename from common.mk
rename to Makefile
index c4bb97d..9dba5f7 100644
--- a/common.mk
+++ b/Makefile
@@ -1,3 +1,6 @@
+GOPATH != pwd
+VERSION != cat VERSION
+
 MOD = go.cypherpunks.ru/gogost/v4
 LDFLAGS = -X $(MOD).Version=$(VERSION)