add packagedeps to merge

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 1985a80f4889e037c03ac1dec8b8b5e59834f35c..8452ed85d61f35c6e9a5dfe693ca070571af9bdf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ stest: $(ZPKGBIN)
 t/ctap/prove: t/ctap/prove.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
-test: $(ZPKGBIN) t/ctap/prove
+test: $(ZPKGBIN) t/ctap/prove db.sql
        @PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/ctap/prove t/*.t
 
 programs: $(PROGRAMS)
@@ -364,9 +364,6 @@ tfm.o: $(addprefix tomsfastmath/src/, $(TFMOBJ))
 
 LTCOBJ= \
    ciphers/aes/aes.o \
-   ciphers/rc5.o \
-   ciphers/rc6.o \
-   ciphers/twofish/twofish.o \
    encauth/ccm/ccm_add_aad.o \
    encauth/ccm/ccm_add_nonce.o \
    encauth/ccm/ccm_done.o \
@@ -431,40 +428,13 @@ LTCOBJ= \
    mac/hmac/hmac_memory_multi.o \
    mac/hmac/hmac_process.o \
    mac/hmac/hmac_test.o \
-   mac/omac/omac_done.o \
-   mac/omac/omac_file.o \
-   mac/omac/omac_init.o \
-   mac/omac/omac_memory.o \
-   mac/omac/omac_memory_multi.o \
-   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 \
    mac/poly1305/poly1305_memory_multi.o \
    mac/poly1305/poly1305_test.o \
-   mac/xcbc/xcbc_done.o \
-   mac/xcbc/xcbc_file.o \
-   mac/xcbc/xcbc_init.o \
-   mac/xcbc/xcbc_memory.o \
-   mac/xcbc/xcbc_memory_multi.o \
-   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 \
@@ -534,33 +504,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 \