From 59c008f98eff598d825ee43ffed7ec57a277c062 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sat, 23 Nov 2019 13:35:22 +0300 Subject: [PATCH] Combine {BSD,GNU}makefiles together, as GNU Make 4.0 supports != assignment --- BSDmakefile | 4 ---- GNUmakefile | 4 ---- common.mk => Makefile | 3 +++ 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 BSDmakefile delete mode 100644 GNUmakefile rename common.mk => Makefile (89%) 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) -- 2.44.0