X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=cd2ce62859dcd8c7ee9d71a0f8011c99fd66305f;hb=0c2216d1e0dc8565a6bf61c9572e47bb1ae1c1fb;hp=4a6225bde430b31cef42fd22fcee5d5b8bcfe6cb;hpb=4fb490d9107b747c86964d0d3925470b06d97c8c;p=zpackage diff --git a/Makefile b/Makefile index 4a6225b..cd2ce62 100644 --- a/Makefile +++ b/Makefile @@ -130,6 +130,7 @@ zpm-addfile: src/addfile.o libzpm.a libelf.a lib/sha256.o: CFLAGS+=-O3 lib/blake2/ref/blake2b-ref.o: CFLAGS+=-O3 +zpm-hash: libzpm.a zpm-hash: src/hash.o lib/sha256.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm @@ -181,7 +182,7 @@ zpm-add: src/add.o libzpm.a libelf.a 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;' >> $@ @@ -801,10 +802,13 @@ crypto/libeddsa/lib/sc.c \ crypto/libeddsa/lib/sha512.c \ crypto/libeddsa/lib/x25519.c -SIGNOBJ=$(SIGNSRC:.c=.o) +SIGNOBJ=$(SIGNSRC:.c=.o) lib/readpass.o lib/blake2/ref/blake2b-ref.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) $(CC) -Wall -Wextra -W -Werror -Wno-unused-command-line-argument -static -o $@ $+