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 \
+ blake2b.c
LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
curdir=$(shell pwd)
-ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
+COMPILED=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
zpm-findpkg zpm-shell zpm-soneed zpm-foreach-path zpm-parse \
zpm-script zpm-soname zpm-syncfs zpm-packagehash zpm-verify \
zpm-elftype zpm-quote zpm-note zpm-search zpm-add zpm-fetchurl \
zpm-sign
+BINARIES=$(addprefix bin/, $(COMPILED))
+
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)
-COMPILED=$(ZPKGBIN)
-PROGRAMS=$(SCRIPTS) $(COMPILED)
+PROGRAMS=$(addprefix bin/, $(SCRIPTS)) $(BINARIES)
def: programs
- strip $(ZPKGBIN)
+ strip $(BINARIES)
d:
printf '%s\n' $(LZMAOBJ)
gcc -std=c99 -Wall -c -o $@ $<
stest: $(ZPKGBIN)
- PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t
+ PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/$(T).t
t/ctap/prove: t/ctap/prove.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
test: $(ZPKGBIN) t/ctap/prove
- @PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
+ @PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/ctap/prove t/*.t
-programs: $(ZPKGBIN)
+programs: $(PROGRAMS)
uncompress: uncompress.o
$(CC) $(CFLAGS) -o $@ $+ -llzma
-zpm-elftype: elf/elftype.o
+bin/zpm-elftype: elf/elftype.o
$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
-zpm-soname: elf/soname.o
+bin/zpm-soname: elf/soname.o
$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
-zpm-soneed: elf/needed.o
+bin/zpm-soneed: elf/needed.o
$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
-zpm-addfile: src/addfile.o libzpm.a libelf.a
+bin/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: libzpm.a
+bin/zpm-hash: src/hash.o lib/sha256.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
-zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a
+bin/zpm-blake2: src/blake2.o lib/sha256.o lib/blake2/ref/blake2b-ref.o
+ $(CC) -O3 $(CFLAGS) $(LDFLAGS) -o $@ $+
+
+bin/zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf
-zpm-init: src/init.o libzpm.a
+bin/zpm-init: src/init.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
-zpm-stat: src/stat.o
+bin/zpm-stat: src/stat.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
-zpm-extract: src/extract.o libzpm.a
+bin/zpm-extract: src/extract.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
-zpm-script: src/script.o libzpm.a
+bin/zpm-script: src/script.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
-zpm-packagehash: src/packagehash.o libzpm.a
+bin/zpm-packagehash: src/packagehash.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
src/foreach-path.o: CFLAGS+=-Wno-unused-parameter
src/script.o: CFLAGS+=-Wno-unused-parameter
-zpm-foreach-path: src/foreach-path.o libzpm.a sqlite/sqlite3.h
+bin/zpm-foreach-path: src/foreach-path.o libzpm.a sqlite/sqlite3.h
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
-zpm-findpkg: src/findpkg.o libzpm.a
+bin/zpm-findpkg: src/findpkg.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
-zpm-search: src/search.o libzpm.a
+bin/zpm-search: src/search.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
-zpm-note: src/note.o libzpm.a
+bin/zpm-note: src/note.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
-zpm-syncfs: src/syncfs.o libzpm.a libelf.a
+bin/zpm-syncfs: src/syncfs.o libzpm.a libelf.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm
-zpm-parse: src/parse.o lib/parse.o
+bin/zpm-parse: src/parse.o lib/parse.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
-zpm-add: src/add.o libzpm.a libelf.a
+bin/zpm-add: src/add.o libzpm.a libelf.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
-zpm-quote: src/quote.o
+bin/zpm-quote: src/quote.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
-db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql schema/preserve_packages.sql schema/age.sql
+db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql schema/preserve_packages.sql schema/age.sql schema/sign.sql
echo 'begin;' > $@
cat $+ >> $@
echo 'commit;' >> $@
lib/zpm.o: newdb.c
-zpm-vercmp: src/vercmp.o lib/vercmp.o
+bin/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
+bin/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
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
#/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= \
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))
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
-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
crypto/libeddsa/lib/sha512.c \
crypto/libeddsa/lib/x25519.c
-SIGNOBJ=$(SIGNSRC:.c=.o)
+SIGNOBJ=$(SIGNSRC:.c=.o) lib/readpass.o lib/blake2b.o \
+ crypto/chacha.o
$(SIGNOBJ): CFLAGS=-Wall -Wextra -W -Werror -Wno-pointer-sign \
- -Icrypto/libeddsa/lib -Wno-unused-command-line-argument
+ -Wno-missing-braces \
+ -Icrypto/libeddsa/lib -Wno-unused-command-line-argument \
+ -I.
-zpm-sign: $(SIGNOBJ)
+bin/zpm-sign: $(SIGNOBJ)
$(CC) -Wall -Wextra -W -Werror -Wno-unused-command-line-argument -static -o $@ $+
clean:
projects / zpackage / blobdiff