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

diff --git a/BSDmakefile b/BSDmakefile
deleted file mode 100644 (file)
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 (file)
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 c4bb97d0b9dffa509a2cc721e5df66cb2814f776..9dba5f7a91616f4936d776e76b8c0cdc78ad10a2 100644 (file)
--- 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)