X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=eeddc48c6c0be7a7d1199a575204b8a76dde6b76;hb=c7e522980fb7ad09f0ccd2d4cea2d5d54a338b45;hp=b06d1684559ab99091638645fbea8caad5904d98;hpb=0419c62f964b259df1c1816f5870ef62eb97ed7c;p=zpackage

diff --git a/Makefile b/Makefile
index b06d168..eeddc48 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ JSWOBJ=$(JSWSRC:%.c=%.o)
 LIBZPMSRC=sha256.c db.c compress.c uncompress.c zpm.c zpm_hash.c \
 	  foreach_path.c vercmp.c findpkg.c quote.c dbquery.c script_hash.c \
 	  parse.c integ.c seterror.c notes.c createpkg.c buffer.c \
-	  blake2/ref/blake2b-ref.o
+	  blake2b.c
 
 LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
@@ -261,7 +261,7 @@ crypto/%.o: CFLAGS+=-Icrypto -DTFM_DESC -DTFM_NO_ASM \
 
 #/usr/musl/bin/musl-clang -Wall -Wextra -Wno-missing-braces -Werror -Wno-pointer-sign -I. -DTFM_DESC -DTFM_NO_ASM -I ../libtomcrypt/src/headers -I ../tomsfastmath/src/headers -DSTRICT_TLS -DIGNORE_SESSION_ID --rtlib=compiler-rt   -c -o tlse.o tlse.c
 
-tls.o: $(addprefix crypto/, $(TLSOBJ))
+crypto/tls.o: $(addprefix crypto/, $(TLSOBJ))
 	ld -o $@ -r $+
 
 TFMOBJ= \
@@ -356,6 +356,7 @@ TFMOBJ= \
    sqr/fp_sqrmod.o
 
 tomsfastmath/src/addsub/%.o: CFLAGS+=-DTFM_DESC -DTFM_NO_ASM -Itomsfastmath/src/headers -DARGTYPE=4
+
 tomsfastmath/src/%.o: CFLAGS+=-DTFM_DESC -DTFM_NO_ASM -Itomsfastmath/src/headers -DARGTYPE=4
 
 tfm.o: $(addprefix tomsfastmath/src/, $(TFMOBJ))
@@ -783,7 +784,7 @@ rfc3986: rfc3986.c
 
 src/fetchurl.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE -Icrypto -Wno-pointer-sign
 
-bin/zpm-fetchurl: ltc.o tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o
+bin/zpm-fetchurl: ltc.o crypto/tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o
 	$(CC) $(CFLAGS) -static -o $@ $+
 
 testddg: zpm-fetchurl
@@ -803,7 +804,7 @@ crypto/libeddsa/lib/sc.c \
 crypto/libeddsa/lib/sha512.c \
 crypto/libeddsa/lib/x25519.c
 
-SIGNOBJ=$(SIGNSRC:.c=.o) lib/readpass.o lib/blake2/ref/blake2b-ref.o \
+SIGNOBJ=$(SIGNSRC:.c=.o) lib/readpass.o lib/blake2b.o \
 	crypto/chacha.o
 
 $(SIGNOBJ): CFLAGS=-Wall -Wextra -W -Werror -Wno-pointer-sign \