Welcome to little lamb

Code » test-hashes » commit 9153fa7

meta: Updated to new way of dependency handling

author Olivier Brunel
2023-01-25 22:52:15 UTC
committer Olivier Brunel
2023-01-25 22:52:15 UTC
parent 6205d07b39e455ee1f369dea0cd12d035a1aac20

meta: Updated to new way of dependency handling

meta/bins/test-blake2s-skalibs +3 -0
meta/bins/test-blake3-limb +4 -0
meta/bins/test-blake3-off +10 -0
meta/bins/test-blake3-off-noopt +6 -0
meta/bins/test-sha1-skalibs +3 -0
meta/bins/test-sha256-skalibs +3 -0
meta/bins/test-sha3-limb +4 -0
meta/bins/test-sha3-nettle +6 -0
meta/bins/test-sha3-tiny +4 -0
meta/bins/test-sha3-unrolled +4 -0
meta/deps-bin +0 -10
project.mk +2 -2

diff --git a/meta/bins/test-blake2s-skalibs b/meta/bins/test-blake2s-skalibs
new file mode 100644
index 0000000..ff16b9a
--- /dev/null
+++ b/meta/bins/test-blake2s-skalibs
@@ -0,0 +1,3 @@
+src/test.o
+src/blake2s-ska.o
+skalibs
diff --git a/meta/bins/test-blake3-limb b/meta/bins/test-blake3-limb
new file mode 100644
index 0000000..6cb23b8
--- /dev/null
+++ b/meta/bins/test-blake3-limb
@@ -0,0 +1,4 @@
+src/test.o
+src/blake3-lila.o
+limb
+skalibs
diff --git a/meta/bins/test-blake3-off b/meta/bins/test-blake3-off
new file mode 100644
index 0000000..31f858e
--- /dev/null
+++ b/meta/bins/test-blake3-off
@@ -0,0 +1,10 @@
+src/test.o
+skalibs
+src/blake3-off-impl.o
+src/blake3-off-impl-portable.o
+src/blake3-off-impl-dispatch.o
+src/blake3_avx2_x86-64_unix.O
+src/blake3_avx512_x86-64_unix.O
+src/blake3_sse2_x86-64_unix.O
+src/blake3_sse41_x86-64_unix.O
+src/blake3-off.o
diff --git a/meta/bins/test-blake3-off-noopt b/meta/bins/test-blake3-off-noopt
new file mode 100644
index 0000000..204a400
--- /dev/null
+++ b/meta/bins/test-blake3-off-noopt
@@ -0,0 +1,6 @@
+src/test.o
+skalibs
+src/blake3-off-noopt-impl.o
+src/blake3-off-noopt-impl-portable.o
+src/blake3-off-noopt-impl-dispatch.o
+src/blake3-off-noopt.o
diff --git a/meta/bins/test-sha1-skalibs b/meta/bins/test-sha1-skalibs
new file mode 100644
index 0000000..9d620e1
--- /dev/null
+++ b/meta/bins/test-sha1-skalibs
@@ -0,0 +1,3 @@
+src/test.o
+src/sha1-ska.o
+skalibs
diff --git a/meta/bins/test-sha256-skalibs b/meta/bins/test-sha256-skalibs
new file mode 100644
index 0000000..21f1d65
--- /dev/null
+++ b/meta/bins/test-sha256-skalibs
@@ -0,0 +1,3 @@
+src/test.o
+src/sha256-ska.o
+skalibs
diff --git a/meta/bins/test-sha3-limb b/meta/bins/test-sha3-limb
new file mode 100644
index 0000000..5a0282c
--- /dev/null
+++ b/meta/bins/test-sha3-limb
@@ -0,0 +1,4 @@
+src/test.o
+src/sha3-lila.o
+limb
+skalibs
diff --git a/meta/bins/test-sha3-nettle b/meta/bins/test-sha3-nettle
new file mode 100644
index 0000000..9dfc440
--- /dev/null
+++ b/meta/bins/test-sha3-nettle
@@ -0,0 +1,6 @@
+src/test.o
+skalibs
+src/sha3-nettle-impl-le.o
+src/sha3-nettle-impl-memxor.o
+src/sha3-nettle-impl.o
+src/sha3-nettle.o
diff --git a/meta/bins/test-sha3-tiny b/meta/bins/test-sha3-tiny
new file mode 100644
index 0000000..650e2e3
--- /dev/null
+++ b/meta/bins/test-sha3-tiny
@@ -0,0 +1,4 @@
+src/test.o
+skalibs
+src/tiny-sha3.o
+src/sha3-tiny.o
diff --git a/meta/bins/test-sha3-unrolled b/meta/bins/test-sha3-unrolled
new file mode 100644
index 0000000..2bb728a
--- /dev/null
+++ b/meta/bins/test-sha3-unrolled
@@ -0,0 +1,4 @@
+src/test.o
+skalibs
+src/sha3-unrolled-impl.o
+src/sha3-unrolled.o
diff --git a/meta/deps-bin b/meta/deps-bin
deleted file mode 100644
index 9170fa8..0000000
--- a/meta/deps-bin
+++ /dev/null
@@ -1,10 +0,0 @@
-test-sha1-ska: src/test.o src/sha1-ska.o skalibs
-test-sha256-ska: src/test.o src/sha256-ska.o skalibs
-test-blake2s-ska: src/test.o src/blake2s-ska.o skalibs
-test-sha3-lila: src/test.o src/sha3-lila.o limb skalibs
-test-blake3-lila: src/test.o src/blake3-lila.o limb skalibs
-test-sha3-tiny: src/test.o skalibs src/tiny-sha3.o src/sha3-tiny.o
-test-sha3-unrolled: src/test.o skalibs src/sha3-unrolled-impl.o src/sha3-unrolled.o
-test-sha3-nettle: src/test.o skalibs src/sha3-nettle-impl-le.o src/sha3-nettle-impl-memxor.o src/sha3-nettle-impl.o src/sha3-nettle.o
-test-blake3-off: src/test.o skalibs src/blake3-off-impl.o src/blake3-off-impl-portable.o src/blake3-off-impl-dispatch.o src/blake3_avx2_x86-64_unix.S src/blake3_avx512_x86-64_unix.S src/blake3_sse2_x86-64_unix.S src/blake3_sse41_x86-64_unix.S src/blake3-off.o
-test-blake3-off-noopt: src/test.o skalibs src/blake3-off-noopt-impl.o src/blake3-off-noopt-impl-portable.o src/blake3-off-noopt-impl-dispatch.o src/blake3-off-noopt.o
diff --git a/project.mk b/project.mk
index a726c0a..a9b2bba 100644
--- a/project.mk
+++ b/project.mk
@@ -1,6 +1,6 @@
 # binaries: -- don't forget to set meta/deps-bin with all deps & .o files
-BINS = test-sha1-ska test-sha256-ska test-blake2s-ska \
-	   test-sha3-lila test-blake3-lila \
+BINS = test-sha1-skalibs test-sha256-skalibs test-blake2s-skalibs \
+	   test-sha3-limb test-blake3-limb \
 	   test-sha3-tiny \
 	   test-sha3-unrolled \
 	   test-sha3-nettle \