* configure.in: Add KRB5_BUILD_PROGRAM

	* Makefile.in (verify): Use CC_LINK and proper Makefile variables
        for library dependencies.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10494 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 6b0c73f2f729fe3f62b1946eb4a5d80116b0051a..b137e4a75502c9cc9c2556a8d3a01fddf1d898c9 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar  3 08:59:03 1998  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * configure.in: Add KRB5_BUILD_PROGRAM
+
+       * Makefile.in (verify): Use CC_LINK and proper Makefile variables
+        for library dependencies.
+
 Wed Feb 18 16:10:05 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trialing slash from thisconfigdir.  Fix up

diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 36ffaa9f549630bfda28deb55b7a8e2a6952d27b..e284839ec777741387cecdbb97e25b08c985317a 100644 (file)
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -8,6 +8,9 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/k
 ##DOS##OBJFILEDEP=des425.lst
 ##DOS##OBJFILELIST=@des425.lst
 
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
+
 RUN_SETUP=@KRB5_RUN_ENV@
 
 LIB=des425
@@ -72,10 +75,6 @@ SRCS=        $(srcdir)/cksum.c       \
        $(srcdir)/weak_key.c    \
        $(srcdir)/k4_glue.c
 
-# For test programs
-EXT_LIB= libdes425.a $(TOPLIBD)/libcrypto.a
-DEPKLIB= $(TOPLIBD)/libcrypto.a
-
 all-unix:: all-liblinks
 all-mac:: $(OBJS)
 
@@ -84,8 +83,8 @@ all-mac:: $(OBJS)
 shared:
        mkdir shared
 
-verify: verify.o libdes425.a $(DEPKLIB)
-       $(CC) -o $@ verify.o $(LDFLAGS) $(EXT_LIB)
+verify: verify.o $(DES425_DEPLIB) $(KRB5_BASE_DEPLIBS)
+       $(CC_LINK) -o $@ verify.o $(DES425_LIB) $(KRB5_BASE_LIBS)
 
 check-unix:: verify
        $(RUN_SETUP) ./verify -z

diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index c124c212ec92e1560fed94a5cd1df669086cde6c..291b4490816c854e8a43ea4a4072402bf93bea4c 100644 (file)
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -22,4 +22,6 @@ dnl
 KRB5_RUN_FLAGS
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
+KRB5_BUILD_PROGRAM
+dnl
 V5_AC_OUTPUT_MAKEFILE