From 06f8e4f960b27ff5dd044e5098e597a40e64f4b8 Mon Sep 17 00:00:00 2001
From: Stefano Brivio <sbrivio@redhat.com>
Date: Tue, 1 Mar 2022 21:41:22 +0100
Subject: Makefile, hooks: Static target precondition for pkgs, copy .avx2
 builds

Convenience packages are anyway built from static builds.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 Makefile       |  2 +-
 README.md      |  2 --
 hooks/pre-push | 12 ++++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 8387719..a2640ff 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ uninstall:
 	-${RM} $(DESTDIR)$(prefix)/share/man/man1/pasta.1
 	-${RM} $(DESTDIR)$(prefix)/share/man/man1/qrap.1
 
-pkgs:
+pkgs: static
 	tar cf passt.tar -P --xform 's//\/usr\/bin\//' $(BIN)
 	tar rf passt.tar -P --xform 's//\/usr\/share\/man\/man1\//' \
 		passt.1 pasta.1 qrap.1
diff --git a/README.md b/README.md
index 4966e15..93bcb87 100644
--- a/README.md
+++ b/README.md
@@ -473,7 +473,6 @@ Test logs [here](/builds/latest/test/).
       distributions are also available there. These binaries and packages are
       simply built with:
 
-            make static
             make pkgs
 
 * have a look at the _man_ page for synopsis and options:
@@ -533,7 +532,6 @@ Test logs [here](/builds/latest/test/).
       distributions are also available there. These binaries and packages are
       simply built with:
 
-            make static
             make pkgs
 
 * have a look at the _man_ page for synopsis and options:
diff --git a/hooks/pre-push b/hooks/pre-push
index 6a9b712..b75fe4b 100755
--- a/hooks/pre-push
+++ b/hooks/pre-push
@@ -47,17 +47,17 @@ done
 
 cd ..
 
-make static
-scp passt pasta qrap passt.1 pasta.1 qrap.1	"${USER_HOST}:${BIN}"
-
-man2html -M "/" passt.1 > passt.1.html
-scp passt.1.html				"${USER_HOST}:${WEB}/"
-
 make pkgs
+scp passt passt.avx2 passt.1 qrap qrap.1	"${USER_HOST}:${BIN}"
+scp pasta pasta.avx2 pasta.1			"${USER_HOST}:${BIN}"
+
 ssh "${USER_HOST}" 				"rm -f ${BIN}/*.deb"
 ssh "${USER_HOST}"				"rm -f ${BIN}/*.rpm"
 scp *.deb *.rpm					"${USER_HOST}:${BIN}/"
 
+man2html -M "/" passt.1 > passt.1.html
+scp passt.1.html				"${USER_HOST}:${WEB}/"
+
 ssh "${USER_HOST}"				"mv ${LATEST} ${AWAY}"
 ssh "${USER_HOST}"				"mv ${TEMP} ${LATEST}"
 ssh "${USER_HOST}"				"rm -rf ${AWAY}"
-- 
cgit v1.2.3