From b63d0ce00f35821ce0911931b015933e862f9c87 Mon Sep 17 00:00:00 2001
From: Moser Michael <moser.michael@gmail.com>
Date: Tue, 10 May 2022 01:52:46 +0300
Subject: [PATCH] update makefile

---
 Makefile  | 31 ++++++++++++++++++++++---------
 README.md |  6 +++---
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index ac3898d..f175734 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,19 @@ main: makego makeJava
 makego:
 	GOPATH=$(PWD) GO111MODULE=off go build -o rzgrep cmd/rzgrep/main.go
 
+.PHONY: makego-arch
+makego-arch:
+	GOPATH=$(PWD) GO111MODULE=off GOARCH=$(GOARCH) GOOS=$(GOOS) go build -o rzgrep-${GOOS}-${GOARCH} cmd/rzgrep/main.go
+	tar cvfz rzgrep-${GOOS}-${GOARCH}.tar.gz rzgrep-${GOOS}-${GOARCH} rzgrep.jar
+
+.PHONY: makego-all
+makego-all: makeJava
+	GOOS=darwin GOARCH=arm64 make makego-arch
+	GOOS=darwin GOARCH=amd64 make makego-arch
+	GOOS=linux  GOARCH=arm64 make makego-arch
+	GOOS=linux  GOARCH=amd64 make makego-arch
+	echo "*** all architectures compiled ***"
+	
 .PHONY: makeJava
 makeJava: 
 	cd java-decompiler; ./gradlew build
@@ -17,14 +30,14 @@ vet:
 
 .PHONY: clean
 clean:
-	rm -f rzgrep rzgrep-*.tar.gz
+	rm -f rzgrep*
 
-rel: clean makego
-	mv rzgrep rzgrep
-	tar cvfz rzgrep-$(shell uname -s).tar.gz rzgrep rzgrep.jar
+#rel: clean makego
+#	mv rzgrep rzgrep
+#	tar cvfz rzgrep-$(shell uname -s)-$(shell uname -m).tar.gz rzgrep rzgrep.jar
 
-allrel : rel
-	docker build --progress=plain --rm=true -t rzgrep-builder:latest . 
-	docker create -ti --name dummy rzgrep-builder:latest
-	docker cp dummy:/go/rzgrep-Linux.tar.gz .
-	docker rm -f dummy
+#allrel : rel
+#	docker build --progress=plain --rm=true -t rzgrep-builder:latest . 
+#	docker create -ti --name dummy rzgrep-builder:latest
+#	docker cp dummy:/go/rzgrep-Linux.tar.gz .
+#	docker rm -f dummy
diff --git a/README.md b/README.md
index 116681d..56902b2 100644
--- a/README.md
+++ b/README.md
@@ -3341,11 +3341,11 @@ org/jd/core/v1/util/DefaultStack.class:(71)             }
 + echo '*** Java decompiler: show first twenty imports by popularity ***'
 *** Java decompiler: show first twenty imports by popularity ***
 + ./rzgrep -e '^import' -in rzgrep.jar -j
-+ awk '{ print $3 }'
++ head -20
++ sort -k 1 -r
 + sort
 + uniq -c
-+ sort -k 1 -r
-+ head -20
++ awk '{ print $3 }'
   82 org.jd.core.v1.model.javasyntax.type.Type;
   64 org.jd.core.v1.model.javasyntax.expression.Expression;
   63 org.jd.core.v1.model.javasyntax.type.ObjectType;