From f5feac72367bbaf855c57696036063ef150ce9b2 Mon Sep 17 00:00:00 2001
From: Paul Park <pjpark@mit.edu>
Date: Fri, 7 Jul 1995 20:58:36 +0000
Subject: Reorganize library logic and use LDFLAGS from configure

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6250 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/gss-sample/ChangeLog    |  5 +++++
 src/appl/gss-sample/Makefile.in  | 15 ++++++---------
 src/appl/gss-sample/configure.in |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/appl/gss-sample')

diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index d8cf29f92d..bb2ec0d8b4 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:41:47 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling.
+	* configure.in - Add KRB5_LIBRARIES.
+
+
 Thu Jun 15 17:35:08 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Change explicit library names to -l<lib> form, and
 		change target link line to use $(LD) and associated flags.
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index a04d03b21b..12ee366e5e 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,22 +1,19 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-
 SRCS= gss-client.c gss-misc.c gss-server.c
 
 OBJS= gss-client.o gss-misc.o gss-server.o
 
 all:: gss-server gss-client
 
-KLIB = -lgssapi_krb5 -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \
-		$(TOPLIBD)/libcrypto.a $(COMERRLIB)
+LOCAL_LIBRARIES = -lgssapi_krb5
+DEPLOCAL_LIBRARIES = $(TOPLIBD)/gssapi/libgssapi_krb5.a
 
-gss-server: gss-server.o gss-misc.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o gss-server gss-server.o gss-misc.o $(KLIB) $(LIBS)
+gss-server: gss-server.o gss-misc.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o gss-server gss-server.o gss-misc.o $(LIBS)
 
-gss-client: gss-client.o gss-misc.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o gss-client gss-client.o gss-misc.o $(KLIB) $(LIBS)
+gss-client: gss-client.o gss-misc.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o gss-client gss-client.o gss-misc.o $(LIBS)
 
 gss-client.o:	$(srcdir)/gss-client.c
 
diff --git a/src/appl/gss-sample/configure.in b/src/appl/gss-sample/configure.in
index def5fa4383..5987e3afd8 100644
--- a/src/appl/gss-sample/configure.in
+++ b/src/appl/gss-sample/configure.in
@@ -4,5 +4,6 @@ AC_HAVE_HEADERS(unistd.h)
 AC_HEADER_CHECK(string.h,AC_DEFINE(USE_STRING_H))
 AC_CONST
 AC_PROG_INSTALL
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
-- 
cgit