]> pd.if.org Git - zpackage/commitdiff
move tls object file into crypto directory
authorNathan Wagner <nw@hydaspes.if.org>
Sat, 6 Jul 2019 22:04:09 +0000 (22:04 +0000)
committerNathan Wagner <nw@hydaspes.if.org>
Sat, 6 Jul 2019 22:04:09 +0000 (22:04 +0000)
Makefile

index b06d1684559ab99091638645fbea8caad5904d98..aad20b6ec1209d91ee6e49478b320ceb77244047 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -261,7 +261,7 @@ crypto/%.o: CFLAGS+=-Icrypto -DTFM_DESC -DTFM_NO_ASM \
 
 #/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= \
@@ -356,6 +356,7 @@ 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))
@@ -783,7 +784,7 @@ rfc3986: rfc3986.c
 
 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
 
-bin/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