From d3e98fb73a5966736f9c5a9479bad27eff2cccd3 Mon Sep 17 00:00:00 2001
From: Paul Buetow <pbuetow@mimecast.com>
Date: Wed, 21 Jun 2023 11:26:31 +0300
Subject: rename samples to examples

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 680cef6..d764051 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ clean:
 	  test -f $$cmd && rm $$cmd; \
 	done
 vet:
-	find . -type d | egrep -v '(./samples|./log|./doc)' | while read dir; do \
+	find . -type d | egrep -v '(./examples|./log|./doc)' | while read dir; do \
 	  echo ${GO} vet $$dir; \
 	  ${GO} vet $$dir; \
 	done
-- 
cgit v1.2.3


From b518c88c108939510bd6523158619c3a54d8f53d Mon Sep 17 00:00:00 2001
From: Paul Buetow <pbuetow@mimecast.com>
Date: Thu, 7 Sep 2023 11:46:46 +0300
Subject: refactor go build tags

---
 Makefile | 45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d764051..717d701 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,31 @@
 GO ?= go
+ifdef DTAIL_USE_ACL
+GO_TAGS=linuxacl
+endif
+ifdef DTAIL_USE_PROPRIETARY
+GO_TAGS+=proprietary
+endif
 all: build
 build: dserver dcat dgrep dmap dtail dtailhealth
 dserver:
-ifndef DTAIL_USE_ACL
-	${GO} build ${GO_FLAGS} -o dserver ./cmd/dserver/main.go
-else
-	${GO} build ${GO_FLAGS} -tags linuxacl -o dserver ./cmd/dserver/main.go
-endif
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dserver ./cmd/dserver/main.go
 dcat:
-	${GO} build ${GO_FLAGS} -o dcat ./cmd/dcat/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dcat ./cmd/dcat/main.go
 dgrep:
-	${GO} build ${GO_FLAGS} -o dgrep ./cmd/dgrep/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dgrep ./cmd/dgrep/main.go
 dmap:
-	${GO} build ${GO_FLAGS} -o dmap ./cmd/dmap/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dmap ./cmd/dmap/main.go
 dtail:
-	${GO} build ${GO_FLAGS} -o dtail ./cmd/dtail/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dtail ./cmd/dtail/main.go
 dtailhealth:
-	${GO} build ${GO_FLAGS} -o dtailhealth ./cmd/dtailhealth/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dtailhealth ./cmd/dtailhealth/main.go
 install:
-ifndef DTAIL_USE_ACL
-	${GO} install ./cmd/dserver/main.go
-else
-	${GO} install -tags linuxacl ./cmd/dserver/main.go
-endif
-	${GO} install ./cmd/dcat/main.go
-	${GO} install ./cmd/dgrep/main.go
-	${GO} install ./cmd/dmap/main.go
-	${GO} install ./cmd/dtail/main.go
-	${GO} install ./cmd/dtailhealth/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dserver/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dcat/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dgrep/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dmap/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dtail/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dtailhealth/main.go
 clean:
 	ls ./cmd/ | while read cmd; do \
 	  test -f $$cmd && rm $$cmd; \
@@ -47,10 +45,5 @@ lint:
 	done | grep -F .go:
 test:
 	${GO} clean -testcache
-ifndef DTAIL_USE_ACL
 	set -e; find . -name '*_test.go' | while read file; do dirname $$file; done | \
-		sort -u | while read dir; do ${GO} test --race -v $$dir || exit 2; done
-else
-	set -e;find . -name '*_test.go' | while read file; do dirname $$file; done | \
-		sort -u | while read dir; do ${GO} test --tags linuxacl --race -v $$dir || exit 2; done
-endif
+		sort -u | while read dir; do ${GO} test -tags '${GO_TAGS}' --race -v $$dir || exit 2; done
-- 
cgit v1.2.3