From 9691093416bc5a7f85fd55aece90ab5b87b79637 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 18 Jan 2006 02:00:32 +0000 Subject: [PATCH] Include the support library when linking various test programs, because on Solaris, with the vendor compiler, we'll always get references to krb5int_pthread_loaded due to unused inline functions not being eliminated. (Also inclued it in dependencies, and use CC_LINK when it wasn't used before.) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17592 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/ChangeLog | 4 ++++ src/lib/crypto/Makefile.in | 18 +++++++++--------- src/lib/crypto/des/ChangeLog | 4 ++++ src/lib/crypto/des/Makefile.in | 4 ++-- src/lib/crypto/md4/ChangeLog | 5 +++++ src/lib/crypto/md4/Makefile.in | 4 ++-- src/lib/crypto/md5/ChangeLog | 5 +++++ src/lib/crypto/md5/Makefile.in | 4 ++-- src/lib/crypto/sha1/ChangeLog | 5 +++++ src/lib/crypto/sha1/Makefile.in | 8 ++++---- src/lib/des425/ChangeLog | 4 ++++ src/lib/des425/Makefile.in | 4 ++-- src/lib/krb5/krb/ChangeLog | 4 ++++ src/lib/krb5/krb/Makefile.in | 4 ++-- 14 files changed, 54 insertions(+), 23 deletions(-) diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 7365bc293..66c87632f 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,7 @@ +2006-01-17 Ken Raeburn + + * Makefile.in (t_nfold$(EXEEXT)): Include support library. + 2006-01-11 Sam Hartman * keyblocks.c (krb5int_c_free_keyblock): Remove krb5_callconv modifier diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 70d7bb3d3..ed2e103b3 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -186,28 +186,28 @@ check-unix:: t_nfold t_encrypt t_prf t_prng t_hmac t_pkcs5 # $(RUN_SETUP) ./t_pkcs5 -t_nfold$(EXEEXT): t_nfold.$(OBJEXT) nfold.$(OBJEXT) - $(CC_LINK) -o $@ t_nfold.$(OBJEXT) nfold.$(OBJEXT) +t_nfold$(EXEEXT): t_nfold.$(OBJEXT) nfold.$(OBJEXT) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_nfold.$(OBJEXT) nfold.$(OBJEXT) $(SUPPORT_LIB) -t_encrypt$(EXEEXT): t_encrypt.$(OBJEXT) nfold.$(OBJEXT) $(CRYPTO_DEPLIB) +t_encrypt$(EXEEXT): t_encrypt.$(OBJEXT) nfold.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_encrypt.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) -t_prf$(EXEEXT): t_prf.$(OBJEXT) +t_prf$(EXEEXT): t_prf.$(OBJEXT) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_prf.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) -t_prng$(EXEEXT): t_prng.$(OBJEXT) +t_prng$(EXEEXT): t_prng.$(OBJEXT) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_prng.$(OBJEXT) -lk5crypto -lcom_err $(SUPPORT_LIB) -t_hmac$(EXEEXT): t_hmac.$(OBJEXT) $(CRYPTO_DEPLIB) +t_hmac$(EXEEXT): t_hmac.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_hmac.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) -t_pkcs5$(EXEEXT): t_pkcs5.$(OBJEXT) $(CRYPTO_DEPLIB) +t_pkcs5$(EXEEXT): t_pkcs5.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_pkcs5.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) -vectors$(EXEEXT): vectors.$(OBJEXT) $(CRYPTO_DEPLIB) +vectors$(EXEEXT): vectors.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ vectors.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) -t_cts$(EXEEXT): t_cts.$(OBJEXT) $(CRYPTO_DEPLIB) +t_cts$(EXEEXT): t_cts.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_cts.$(OBJEXT) \ $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 3e1628a44..5aee62fc2 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,7 @@ +2006-01-17 Ken Raeburn + + * Makefile.in (destest$(EXEEXT)): Include support library. + 2005-06-10 Ken Raeburn * destest.c (main): Force testing of unaligned access to input, diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index 86d0becf2..acd4af603 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -65,8 +65,8 @@ verify$(EXEEXT): t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \ $(CC_LINK) -o $@ t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \ -lcom_err $(SUPPORT_LIB) -destest$(EXEEXT): destest.$(OBJEXT) $(TOBJS) - $(CC_LINK) -o $@ destest.$(OBJEXT) $(TOBJS) +destest$(EXEEXT): destest.$(OBJEXT) $(TOBJS) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ destest.$(OBJEXT) $(TOBJS) $(SUPPORT_LIB) TAFSS2KOBJS = \ t_afss2k.$(OBJEXT) $(TOBJS) \ diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index 06eac6c69..5537d8570 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,8 @@ +2006-01-17 Ken Raeburn + + * Makefile.in (t_mddriver): Include support library. Use + CC_LINK. + 2005-05-01 Ken Raeburn * md4.c (Transform) [CONFIG_SMALL]: Roll loops for each round. diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index cb0e0f4b7..4dd977e3c 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -33,8 +33,8 @@ t_mddriver.c: $(srcdir)/../md5/t_mddriver.c t_mddriver.o: t_mddriver.c $(CC) -DMD=4 $(ALL_CFLAGS) -c t_mddriver.c -t_mddriver: t_mddriver.o md4.o - $(CC) $(ALL_CFLAGS) -o t_mddriver t_mddriver.o md4.o +t_mddriver: t_mddriver.o md4.o $(SUPPORT_DEPLIB) + $(CC_LINK) -o t_mddriver t_mddriver.o md4.o $(SUPPORT_LIB) $(OUTPRE)t_mddriver.obj: t_mddriver.c $(CC) -DMD=4 $(ALL_CFLAGS) -Fo$@ -c $** diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index ab8d2ca30..bd9a81712 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,8 @@ +2006-01-17 Ken Raeburn + + * Makefile.in (t_mddriver): Include support library. Use + CC_LINK. + 2005-05-01 Ken Raeburn * md5.c (Transform) [CONFIG_SMALL]: Roll loops for each round. diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index 4c0b6a3d6..35f14fafc 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -26,8 +26,8 @@ includes:: depend depend:: $(SRCS) -t_mddriver: t_mddriver.o md5.o - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o t_mddriver t_mddriver.o md5.o +t_mddriver: t_mddriver.o md5.o $(SUPPORT_DEPLIB) + $(CC_LINK) -o t_mddriver t_mddriver.o md5.o $(SUPPORT_LIB) $(OUTPRE)t_mddriver.exe: $(OUTPRE)t_mddriver.obj $(OUTPRE)md5.obj link -out:$@ $** diff --git a/src/lib/crypto/sha1/ChangeLog b/src/lib/crypto/sha1/ChangeLog index 9da70f9c4..e02427682 100644 --- a/src/lib/crypto/sha1/ChangeLog +++ b/src/lib/crypto/sha1/ChangeLog @@ -1,3 +1,8 @@ +2006-01-17 Ken Raeburn + + * Makefile.in (t_shs, t_shs3): Include support library. Use + CC_LINK. + 2005-05-01 Ken Raeburn * shs.c (SHSTransform) [CONFIG_SMALL]: Roll loops for each round. diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in index 90abe2ce6..d2e0b87d1 100644 --- a/src/lib/crypto/sha1/Makefile.in +++ b/src/lib/crypto/sha1/Makefile.in @@ -26,8 +26,8 @@ includes:: depend depend:: $(SRCS) -t_shs: t_shs.o shs.o - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o t_shs t_shs.o shs.o +t_shs: t_shs.o shs.o $(SUPPORT_DEPLIB) + $(CC_LINK) -o t_shs t_shs.o shs.o $(SUPPORT_LIB) $(OUTPRE)t_shs.exe: $(OUTPRE)t_shs.obj $(OUTPRE)shs.obj link -out:$@ $** @@ -45,8 +45,8 @@ clean:: clean-unix:: clean-libobjs -t_shs3: t_shs3.o shs.o - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o t_shs3 t_shs3.o shs.o +t_shs3: t_shs3.o shs.o $(SUPPORT_DEPLIB) + $(CC_LINK) -o t_shs3 t_shs3.o shs.o $(SUPPORT_LIB) # @libobj_frag@ diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 3a6f8b190..0667b6f08 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,7 @@ +2006-01-17 Ken Raeburn + + * Makefile.in (t_quad): Include support library. + 2005-08-20 Ken Raeburn * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index ba894273c..0257f7029 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -84,8 +84,8 @@ shared: verify: verify.o $(DES425_DEPLIB) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ verify.o $(DES425_LIB) $(KRB5_BASE_LIBS) -t_quad: t_quad.o quad_cksum.o - $(CC_LINK) -o $@ t_quad.o quad_cksum.o +t_quad: t_quad.o quad_cksum.o $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_quad.o quad_cksum.o $(SUPPORT_LIB) t_pcbc: t_pcbc.o pcbc_encrypt.o key_sched.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ t_pcbc.o pcbc_encrypt.o key_sched.o $(KRB5_BASE_LIBS) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 93047c5bd..14ef1b566 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,7 @@ +2006-01-17 Ken Raeburn + + * Makefile.in (t_deltat): Include support library. + 2005-12-30 Tom Yu * gc_frm_kdc.c: Rewrite to modularize significantly. (~400-line diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 9b3903cb6..a15eb374e 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -310,8 +310,8 @@ t_ser: $(T_SER_OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o t_ser $(T_SER_OBJS) \ $(KDB5_LIBS) $(KRB5_BASE_LIBS) $(DL_LIB) $(THREAD_LINKOPTS) -t_deltat : $(T_DELTAT_OBJS) - $(CC_LINK) -o t_deltat $(T_DELTAT_OBJS) +t_deltat : $(T_DELTAT_OBJS) $(SUPPORT_DEPLIB) + $(CC_LINK) -o t_deltat $(T_DELTAT_OBJS) $(SUPPORT_LIB) T_EXPAND_OBJS=t_expand.o t_expand.o : t_expand.c -- 2.26.2