X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=4a6225bde430b31cef42fd22fcee5d5b8bcfe6cb;hb=2ac486ab18adbbb84563eafc0d67fa8da6ca7822;hp=802360ba8ce644bffc8176952ad2f70b47c84554;hpb=09490cd2433e3c37a0d85220b4f12f01e6740d46;p=zpackage

diff --git a/Makefile b/Makefile
index 802360b..4a6225b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ lib/jsw/jsw_rbtree.c
 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
+	  parse.c integ.c seterror.c notes.c createpkg.c buffer.c \
+	  blake2/ref/blake2b-ref.o
 
 LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
@@ -126,9 +127,15 @@ zpm-soneed: elf/needed.o
 zpm-addfile: src/addfile.o libzpm.a libelf.a
 	$(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-hash: src/hash.o libzpm.a
+lib/sha256.o: CFLAGS+=-O3
+lib/blake2/ref/blake2b-ref.o: CFLAGS+=-O3
+
+zpm-hash: src/hash.o lib/sha256.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
+zpm-blake2: src/blake2.o lib/sha256.o lib/blake2/ref/blake2b-ref.o
+	$(CC) -O3 $(CFLAGS) $(LDFLAGS) -o $@ $+
+
 zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf
 
@@ -198,10 +205,10 @@ sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile
 
 lib/zpm.o: newdb.c
 
-zpm-vercmp: src/vercmp.o lib/vercmp.o
+zpm-vercmp: src/vercmp.o lib/vercmp.o lib/parse.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 	
-zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o
+zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o lib/parse.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
 libelf.a: elf/libelf.o