From 6d92ee538a8c1511b1ac1dcfaa84d4efb887892d Mon Sep 17 00:00:00 2001
From: tlyu <tlyu@dc483132-0cff-0310-8789-dd5450dbe970>
Date: Sat, 8 Feb 1997 23:50:17 +0000
Subject: [PATCH] 	* Makefile.in: 	* configure.in: Update to new program
 build procedure.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/libhack_branch@9825 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/crypto/des/ChangeLog    |  5 +++++
 src/lib/crypto/des/Makefile.in  | 22 ++++++++++------------
 src/lib/crypto/des/configure.in |  1 +
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index fd7782ca70..a20d378421 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb  8 18:49:39 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Sun Dec 29 21:53:49 1996  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in:
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index a7bbf565b3..313520d86d 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -2,11 +2,9 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\crypto.lib
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.$(LIBEXT)
-
-KLIB = $(TOPLIBD)/libkrb5.$(LIBEXT) $(TOPLIBD)/libcrypto.$(LIBEXT) $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.$(LIBEXT) $(TOPLIBD)/libcrypto.$(LIBEXT) $(COMERRLIB)
 RUN_SETUP = @KRB5_RUN_ENV@
 
 STLIBOBJS=\
@@ -93,16 +91,16 @@ depend:: $(SRCS)
 clean::
 	$(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
 
-verify$(EXEEXT): t_verify.$(OBJEXT) $(DEPKLIB)
-	$(CC) -o $@ t_verify.$(OBJEXT) process_ky.o  key_sched.o \
-	../cryptoconf.o ../des_crc.o $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
+verify$(EXEEXT): t_verify.$(OBJEXT) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ t_verify.$(OBJEXT) process_ky.o  key_sched.o \
+	../cryptoconf.o ../des_crc.o $(KRB5_BASE_LIBS)
 
-destest$(EXEEXT): destest.$(OBJEXT) $(DEPKLIB)
-	$(CC) -o $@ destest.$(OBJEXT) process_ky.o key_sched.o \
-	../cryptoconf.o ../des_crc.o  $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
+destest$(EXEEXT): destest.$(OBJEXT) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ destest.$(OBJEXT) process_ky.o key_sched.o \
+	../cryptoconf.o ../des_crc.o $(KRB5_BASE_LIBS)
 
-t_random$(EXEEXT): t_random.$(OBJEXT) $(DEPKLIB)
-	$(LD) -o $@ t_random.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
+t_random$(EXEEXT): t_random.$(OBJEXT) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ t_random.$(OBJEXT) $(KRB5_BASE_LIBS)
 
 check-unix:: destest verify
 	$(RUN_SETUP) ./verify -z
diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in
index e4941ce390..20cc4376cf 100644
--- a/src/lib/crypto/des/configure.in
+++ b/src/lib/crypto/des/configure.in
@@ -2,4 +2,5 @@ AC_INIT(configure.in)
 CONFIG_RULES
 KRB5_RUN_FLAGS
 KRB5_BUILD_LIBOBJS
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE