X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=Makefile;h=6358c207a42a6a6d01d56eba0c22cfa3a6176509;hp=5ffd76bac2b5d4a4f30a1acd2d63eee87f2589ba;hb=05b0022ef60e73eb446b272fa6481f1f8a479974;hpb=a52ee0733f420ca20224049260d6fc5cf7d8f621

diff --git a/Makefile b/Makefile
index 5ffd76b..6358c20 100644
--- a/Makefile
+++ b/Makefile
@@ -31,13 +31,14 @@ curdir=$(shell pwd)
 ZPKGBIN=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-elftype zpm-quote zpm-note zpm-search zpm-add zpm-fetchurl
 
-SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
+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
 
-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)
+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)
 
@@ -109,61 +110,64 @@ programs: $(ZPKGBIN)
 uncompress: uncompress.o 
 	$(CC) $(CFLAGS) -o $@ $+ -llzma
 
-zpm-elftype: elf/elftype.c
-	$(CC) -Ielf $(CFLAGS) -o $@ $+
+zpm-elftype: elf/elftype.o
+	$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
 
-zpm-soname: elf/soname.c
-	$(CC) -Ielf $(CFLAGS) -o $@ $+
+zpm-soname: elf/soname.o
+	$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
 
-zpm-soneed: elf/needed.c
-	$(CC) -Ielf $(CFLAGS) -o $@ $+
+zpm-soneed: elf/needed.o
+	$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
 
-zpm-addfile: zpm-addfile.o libzpm.a libelf.a
+zpm-addfile: src/addfile.o libzpm.a libelf.a
 	$(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-hash: zpm-hash.o libzpm.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+zpm-hash: src/hash.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
-zpm-verify: zpm-verify.o t/ctap/ctap.o libzpm.a
+zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf
 
-zpm-init: zpm-init.o libzpm.a
+zpm-init: src/init.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-extract: zpm-extract.o libzpm.a
+zpm-stat: src/stat.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+zpm-extract: src/extract.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-script: zpm-script.o libzpm.a
+zpm-script: src/script.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 	
-zpm-packagehash: zpm-packagehash.o libzpm.a
+zpm-packagehash: src/packagehash.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-foreach-path.o: CFLAGS+=-Wno-unused-parameter
-zpm-script.o: CFLAGS+=-Wno-unused-parameter
+src/foreach-path.o: CFLAGS+=-Wno-unused-parameter
+src/script.o: CFLAGS+=-Wno-unused-parameter
 
-zpm-foreach-path: zpm-foreach-path.o libzpm.a sqlite/sqlite3.h
+zpm-foreach-path: src/foreach-path.o libzpm.a sqlite/sqlite3.h
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-findpkg: zpm-findpkg.o libzpm.a
+zpm-findpkg: src/findpkg.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-search: zpm-search.o libzpm.a
+zpm-search: src/search.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-note: zpm-note.o libzpm.a
+zpm-note: src/note.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-syncfs: zpm-syncfs.o libzpm.a libelf.a
+zpm-syncfs: src/syncfs.o libzpm.a libelf.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm
 
-zpm-parse: zpm-parse.o lib/parse.o
+zpm-parse: src/parse.o lib/parse.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
-zpm-add: zpm-add.o libzpm.a libelf.a
+zpm-add: src/add.o libzpm.a libelf.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-quote: zpm-quote.o
+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
@@ -190,7 +194,7 @@ sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile
 
 lib/zpm.o: newdb.c
 
-zpm-vercmp: zpm-vercmp.o lib/vercmp.o
+zpm-vercmp: src/vercmp.o lib/vercmp.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 	
 zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o
@@ -227,7 +231,7 @@ scalarmult.o
 
 TLSOBJ= tlse.o x25519.o chacha.o base64.o pem.o forward.o handshake.o \
 	buffer.o parse_client_hello.o parse_message.o cipher_supported.o \
-	packet_update.o hmac_message.o hkdf.o hash.o
+	packet_update.o hmac_message.o hkdf.o hash.o cipher_name.o
 
 crypto/x25519.o: $(addprefix crypto/ref10/, $(X255OBJ))
 	ld -o $@ -r $+
@@ -753,9 +757,16 @@ libtomcrypt/%.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DA
 ltc.o: $(addprefix libtomcrypt/src/, $(LTCOBJ))
 	ld -o $@ -r $+
 
-zpm-fetchurl.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE -Icrypto
+crypto/rfc3986.c: crypto/rfc3986.re
+	re2c --input custom --tags -o $@ $<
+
+rfc3986: rfc3986.c
+	$(CC) -Wall -W -Wextra -Werror -o $@ $+
+
+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 -DDEBUG
 
-zpm-fetchurl: ltc.o tls.o tfm.o zpm-fetchurl.o crypto/https.o
+zpm-fetchurl: ltc.o tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o
+	$(CC) $(CFLAGS) -o $@ $+
 
 testddg: zpm-fetchurl
 	./zpm-fetchurl duckduckgo.com 443 /
@@ -763,6 +774,24 @@ testddg: zpm-fetchurl
 testgra: zpm-fetchurl
 	./zpm-fetchurl granicus.if.org 443 /
 
+SIGNSRC= \
+crypto/libeddsa/lib/burn.c \
+crypto/libeddsa/lib/burnstack.c \
+crypto/libeddsa/lib/ed.c \
+crypto/libeddsa/lib/ed25519-sha512.c \
+crypto/libeddsa/lib/fld.c \
+crypto/libeddsa/lib/sc.c \
+crypto/libeddsa/lib/sha512.c \
+crypto/libeddsa/lib/x25519.c \
+crypto/libeddsa/sign.c
+
+SIGNOBJ=$(SIGNSRC:.c=.o)
+
+$(SIGNOBJ): CFLAGS+=-Icrypto/libeddsa/lib
+
+zpm-sign: $(SIGNOBJ)
+	$(CC) $(CFLAGS) -o $@ $+
+
 clean:
 	rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
 		libelf.a libzpm.a zpm-addfile soname \