From: Tom Yu <tlyu@mit.edu>
Date: Sun, 24 May 2009 22:51:32 +0000 (+0000)
Subject: pull up r22368 from trunk
X-Git-Tag: krb5-1.7-beta3~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=884600176dac241528e3bfe26647fb3d24213424;p=krb5.git

pull up r22368 from trunk

 ------------------------------------------------------------------------
 r22368 | ghudson | 2009-05-24 02:48:31 +0200 (Sun, 24 May 2009) | 10 lines

 ticket: 6495
 subject: Fix test rules for non-gmake make versions
 target_version: 1.7
 tags: pullup

 The build rules for the new t_ad_fx_armor and t_authdata test programs
 used $<, which is only portable for implicit rules (but is valid in
 gmake for all rules).  Stop using $< in those rules so that "make
 check" works with System V make.

ticket: 6495
version_fixed: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22376 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index c5256b313..db1f82372 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -319,10 +319,10 @@ T_PRINC_OBJS= t_princ.o parse.o unparse.o
 t_walk_rtree: $(T_WALK_RTREE_OBJS) $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o t_walk_rtree $(T_WALK_RTREE_OBJS) $(KRB5_BASE_LIBS)
 t_ad_fx_armor: t_ad_fx_armor.o
-	$(CC_LINK) -o $@ $< $(KRB5_BASE_LIBS)
+	$(CC_LINK) -o $@ t_ad_fx_armor.o $(KRB5_BASE_LIBS)
 
 t_authdata: t_authdata.o copy_auth.o
-	$(CC_LINK) -o $@ $< copy_auth.o $(KRB5_BASE_LIBS)
+	$(CC_LINK) -o $@ t_authdata.o copy_auth.o $(KRB5_BASE_LIBS)
 
 t_kerb: $(T_KERB_OBJS) $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o t_kerb $(T_KERB_OBJS) $(KRB5_BASE_LIBS)