fix compile process for elf programs

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 5ffd76bac2b5d4a4f30a1acd2d63eee87f2589ba..1f3ea83a985d43ce111b26c89168957ab73680c3 100644 (file)
--- 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 \
        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,14 +110,14 @@ 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
        $(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
@@ -227,7 +228,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 +754,15 @@ 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 $@ $<
 
-zpm-fetchurl: ltc.o tls.o tfm.o zpm-fetchurl.o crypto/https.o
+rfc3986: rfc3986.c
+       $(CC) -Wall -W -Wextra -Werror -o $@ $+
+
+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 -Wno-pointer-sign -DDEBUG
+
+zpm-fetchurl: ltc.o tls.o tfm.o zpm-fetchurl.o crypto/https.o crypto/rfc3986.o
 
 testddg: zpm-fetchurl
        ./zpm-fetchurl duckduckgo.com 443 /
@@ -763,6 +770,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 \