X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=Makefile;h=83cf5a3d0d1b641c355818349ca6aeeb04821190;hp=d2acd750e8f9c301c6db94fa6216736009841b48;hb=d6319f7ea0a76de91bc01d9734d235b494c40198;hpb=62ebf390fa9ec8f7de054648e978919386fddf2f diff --git a/Makefile b/Makefile index d2acd75..83cf5a3 100644 --- a/Makefile +++ b/Makefile @@ -25,18 +25,20 @@ 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 buffer.c \ - blake2/ref/blake2b-ref.o + 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 \ @@ -44,11 +46,10 @@ SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-test zpm-log \ 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) @@ -102,84 +103,84 @@ lzma.o: lzma.c 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 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 +bin/zpm-hash: src/hash.o lib/sha256.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -zpm-blake2: src/blake2.o lib/sha256.o lib/blake2/ref/blake2b-ref.o +bin/zpm-blake2: src/blake2.o lib/sha256.o lib/blake2/ref/blake2b-ref.o $(CC) -O3 $(CFLAGS) $(LDFLAGS) -o $@ $+ -zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a +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 schema/sign.sql @@ -206,10 +207,10 @@ sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile lib/zpm.o: newdb.c -zpm-vercmp: src/vercmp.o lib/vercmp.o lib/parse.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 lib/parse.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 @@ -260,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= \ @@ -355,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)) @@ -362,24 +364,9 @@ tfm.o: $(addprefix tomsfastmath/src/, $(TFMOBJ)) LTCOBJ= \ ciphers/aes/aes.o \ - ciphers/anubis.o \ - ciphers/blowfish.o \ - ciphers/camellia.o \ - ciphers/cast5.o \ - ciphers/des.o \ - ciphers/kasumi.o \ - ciphers/khazad.o \ - ciphers/kseed.o \ - ciphers/multi2.o \ - ciphers/noekeon.o \ - ciphers/rc2.o \ ciphers/rc5.o \ ciphers/rc6.o \ - ciphers/safer/safer.o \ - ciphers/safer/saferp.o \ - ciphers/skipjack.o \ ciphers/twofish/twofish.o \ - ciphers/xtea.o \ encauth/ccm/ccm_add_aad.o \ encauth/ccm/ccm_add_nonce.o \ encauth/ccm/ccm_done.o \ @@ -397,14 +384,6 @@ LTCOBJ= \ encauth/chachapoly/chacha20poly1305_setiv.o \ encauth/chachapoly/chacha20poly1305_setiv_rfc7905.o \ encauth/chachapoly/chacha20poly1305_test.o \ - encauth/eax/eax_addheader.o \ - encauth/eax/eax_decrypt.o \ - encauth/eax/eax_decrypt_verify_memory.o \ - encauth/eax/eax_done.o \ - encauth/eax/eax_encrypt.o \ - encauth/eax/eax_encrypt_authenticate_memory.o \ - encauth/eax/eax_init.o \ - encauth/eax/eax_test.o \ encauth/gcm/gcm_add_aad.o \ encauth/gcm/gcm_add_iv.o \ encauth/gcm/gcm_done.o \ @@ -418,31 +397,8 @@ LTCOBJ= \ misc/crypt/crypt_find_cipher_id.o \ misc/crypt/crypt_find_hash_any.o \ misc/crypt/crypt_find_hash.o \ - encauth/ocb/ocb_decrypt.o \ - encauth/ocb/ocb_decrypt_verify_memory.o \ - encauth/ocb/ocb_done_decrypt.o \ - encauth/ocb/ocb_done_encrypt.o \ misc/crypt/crypt_find_hash_id.o \ misc/crypt/crypt_find_hash_oid.o \ - encauth/ocb/ocb_encrypt.o \ - encauth/ocb/ocb_encrypt_authenticate_memory.o \ - encauth/ocb/ocb_init.o \ - encauth/ocb/ocb_ntz.o \ - encauth/ocb/ocb_shift_xor.o \ - encauth/ocb/ocb_test.o \ - encauth/ocb/s_ocb_done.o \ - encauth/ocb3/ocb3_add_aad.o \ - encauth/ocb3/ocb3_decrypt.o \ - encauth/ocb3/ocb3_decrypt_last.o \ - encauth/ocb3/ocb3_decrypt_verify_memory.o \ - encauth/ocb3/ocb3_done.o \ - encauth/ocb3/ocb3_encrypt.o \ - encauth/ocb3/ocb3_encrypt_authenticate_memory.o \ - encauth/ocb3/ocb3_encrypt_last.o \ - encauth/ocb3/ocb3_init.o \ - encauth/ocb3/ocb3_int_ntz.o \ - encauth/ocb3/ocb3_int_xor_blocks.o \ - encauth/ocb3/ocb3_test.o \ hashes/blake2b.o \ hashes/blake2s.o \ hashes/chc/chc.o \ @@ -450,23 +406,13 @@ LTCOBJ= \ hashes/helper/hash_filehandle.o \ hashes/helper/hash_memory.o \ hashes/helper/hash_memory_multi.o \ - hashes/md2.o \ - hashes/md4.o \ - hashes/md5.o \ - hashes/rmd128.o \ - hashes/rmd160.o \ - hashes/rmd256.o \ - hashes/rmd320.o \ hashes/sha1.o \ - hashes/sha2/sha224.o \ hashes/sha2/sha256.o \ hashes/sha2/sha384.o \ hashes/sha2/sha512.o \ - hashes/sha2/sha512_224.o \ hashes/sha2/sha512_256.o \ hashes/sha3.o \ hashes/sha3_test.o \ - hashes/tiger.o \ hashes/whirl/whirl.o \ mac/blake2/blake2bmac.o \ mac/blake2/blake2bmac_file.o \ @@ -478,13 +424,6 @@ LTCOBJ= \ mac/blake2/blake2smac_memory.o \ mac/blake2/blake2smac_memory_multi.o \ mac/blake2/blake2smac_test.o \ - mac/f9/f9_done.o \ - mac/f9/f9_file.o \ - mac/f9/f9_init.o \ - mac/f9/f9_memory.o \ - mac/f9/f9_memory_multi.o \ - mac/f9/f9_process.o \ - mac/f9/f9_test.o \ mac/hmac/hmac_done.o \ mac/hmac/hmac_file.o \ mac/hmac/hmac_init.o \ @@ -500,18 +439,6 @@ LTCOBJ= \ mac/omac/omac_process.o \ misc/crypt/crypt_find_prng.o \ mac/omac/omac_test.o \ - mac/pelican/pelican.o \ - mac/pelican/pelican_memory.o \ - mac/pelican/pelican_test.o \ - mac/pmac/pmac_done.o \ - mac/pmac/pmac_file.o \ - mac/pmac/pmac_init.o \ - mac/pmac/pmac_memory.o \ - mac/pmac/pmac_memory_multi.o \ - mac/pmac/pmac_ntz.o \ - mac/pmac/pmac_process.o \ - mac/pmac/pmac_shift_xor.o \ - mac/pmac/pmac_test.o \ mac/poly1305/poly1305.o \ mac/poly1305/poly1305_file.o \ mac/poly1305/poly1305_memory.o \ @@ -525,7 +452,6 @@ LTCOBJ= \ mac/xcbc/xcbc_process.o \ mac/xcbc/xcbc_test.o \ math/fp/ltc_ecc_fp_mulmod.o \ - math/gmp_desc.o \ math/ltm_desc.o \ math/multi.o \ math/radix_to_bin.o \ @@ -595,33 +521,12 @@ LTCOBJ= \ modes/ecb/ecb_done.o \ modes/ecb/ecb_encrypt.o \ modes/ecb/ecb_start.o \ - modes/f8/f8_decrypt.o \ - modes/f8/f8_done.o \ - modes/f8/f8_encrypt.o \ - modes/f8/f8_getiv.o \ - modes/f8/f8_setiv.o \ - modes/f8/f8_start.o \ - modes/f8/f8_test_mode.o \ - modes/lrw/lrw_decrypt.o \ - modes/lrw/lrw_done.o \ - modes/lrw/lrw_encrypt.o \ - modes/lrw/lrw_getiv.o \ - modes/lrw/lrw_process.o \ - modes/lrw/lrw_start.o \ - modes/lrw/lrw_setiv.o \ - modes/lrw/lrw_test.o \ modes/ofb/ofb_decrypt.o \ modes/ofb/ofb_done.o \ modes/ofb/ofb_encrypt.o \ modes/ofb/ofb_getiv.o \ modes/ofb/ofb_setiv.o \ modes/ofb/ofb_start.o \ - modes/xts/xts_decrypt.o \ - modes/xts/xts_done.o \ - modes/xts/xts_encrypt.o \ - modes/xts/xts_init.o \ - modes/xts/xts_mult_x.o \ - modes/xts/xts_test.o \ pk/asn1/der/bit/der_decode_bit_string.o \ pk/asn1/der/bit/der_decode_raw_bit_string.o \ pk/asn1/der/bit/der_encode_bit_string.o \ @@ -719,13 +624,6 @@ LTCOBJ= \ pk/ecc/ltc_ecc_points.o \ pk/ecc/ltc_ecc_projective_add_point.o \ pk/ecc/ltc_ecc_projective_dbl_point.o \ - pk/katja/katja_decrypt_key.o \ - pk/katja/katja_encrypt_key.o \ - pk/katja/katja_export.o \ - pk/katja/katja_exptmod.o \ - pk/katja/katja_free.o \ - pk/katja/katja_import.o \ - pk/katja/katja_make_key.o \ pk/pkcs1/pkcs_1_i2osp.o \ pk/pkcs1/pkcs_1_mgf1.o \ pk/pkcs1/pkcs_1_oaep_decode.o \ @@ -751,25 +649,54 @@ LTCOBJ= \ pk/rsa/rsa_verify_hash.o \ prngs/chacha20.o \ prngs/fortuna.o \ - prngs/rc4.o \ prngs/rng_get_bytes.o \ prngs/rng_make_prng.o \ - prngs/sober128.o \ prngs/sprng.o \ - prngs/yarrow.o \ stream/chacha/chacha_crypt.o \ stream/chacha/chacha_done.o \ stream/chacha/chacha_ivctr32.o \ stream/chacha/chacha_ivctr64.o \ stream/chacha/chacha_keystream.o \ stream/chacha/chacha_setup.o \ - stream/chacha/chacha_test.o \ - stream/rc4/rc4_stream.o \ - stream/rc4/rc4_test.o \ - stream/sober128/sober128_stream.o \ - stream/sober128/sober128_test.o - -libtomcrypt/%.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE + stream/chacha/chacha_test.o + +libtomcrypt/%.o: CFLAGS+= -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -Ilibtomcrypt/src/headers +libtomcrypt/%.o: CFLAGS+= \ + -DTFM_DESC \ + -DTFM_NO_ASM \ + -DLTC_NOTHING \ + -DLTC_NO_ASM \ + -DLTC_SOURCE \ + -DLTC_POLY1305 \ + -DLTC_CHACHA20POLY1305_MODE \ + -DLTC_RIJNDAEL \ + -DLTC_CHACHA \ + -DLTC_ECB_MODE \ + -DLTC_CBC_MODE \ + -DLTC_CTR_MODE \ + -DLTC_GCM_MODE \ + -DLTC_SHA1 \ + -DLTC_SHA3 \ + -DLTC_SHA512 \ + -DLTC_SHA384 \ + -DLTC_SHA256 \ + -DLTC_HASH_HELPERS \ + -DLTC_HMAC \ + -DLTC_OMAC \ + -DLTC_CCM_MODE \ + -DLTC_SPRNG \ + -DLTC_DEVRANDOM \ + -DLTC_TRY_URANDOM_FIRST \ + -DLTC_RNG_GET_BYTES \ + -DLTC_RNG_MAKE_PRNG \ + -DLTC_DER \ + -DLTC_MRSA \ + -DLTC_MECC \ + -DLTC_BASE64 + +tomclean: + rm -f $(addprefix libtomcrypt/src/, $(LTCOBJ)) + rm -f ltc.o ltc.o: $(addprefix libtomcrypt/src/, $(LTCOBJ)) ld -o $@ -r $+ @@ -782,7 +709,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 -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 @@ -802,12 +729,15 @@ 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/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: