X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=4a6225bde430b31cef42fd22fcee5d5b8bcfe6cb;hb=2ac486ab18adbbb84563eafc0d67fa8da6ca7822;hp=244521b911363db9894b467f46d14e1c8846d0ad;hpb=59c9aa3c3536915c28a15567ca9ead3dea866911;p=zpackage

diff --git a/Makefile b/Makefile
index 244521b..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))
 
@@ -38,7 +39,8 @@ ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
 
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-test zpm-log \
 	zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \
-	zpm-pkg zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit
+	zpm-pkg zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit \
+	zpm-pkgdeps
 
 MANPAGES=$(shell ls doc/*.8)
 #MANPAGES=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 note.8 vercmp.8 repo.8 gc.8)
@@ -125,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
 
@@ -197,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
@@ -208,6 +216,8 @@ libelf.a: elf/libelf.o
 
 install: $(COMPILED) $(MANPAGES)
 	test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin
+	test -d $(DESTDIR)/var/lib/zpm || install -d $(DESTDIR)/var/lib/zpm
+	test -d $(DESTDIR)/var/lib/zpm/packages || install -d $(DESTDIR)/var/lib/zpm/packages
 	install $(PROGRAMS) $(DESTDIR)/sbin
 	mkdir -p $(DESTDIR)/usr/share/man/man8
 	install -m644 $(MANPAGES) $(DESTDIR)/usr/share/man/man8