Reorganize library logic and use LDFLAGS from configure

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

6 files changed, 17 insertions, 16 deletions

diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index c07b9e9f82..321938a22d 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:48:14 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add KRB5_LIBRARIES.
+
 Wed Jun 28 13:27:17 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* sim_client.c: Include stdlib.h or declare malloc.
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index f6ac698a3d..0424a3ee4d 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,17 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
-sim_client: sim_client.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sim_client sim_client.o $(KLIB) $(LIBS)
+sim_client: sim_client.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sim_client sim_client.o $(LIBS)
 
 sim_client.o:	$(srcdir)/sim_client.c
 
diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in
index ce69ddf9b5..657e99f367 100644
--- a/src/appl/simple/client/configure.in
+++ b/src/appl/simple/client/configure.in
@@ -2,5 +2,6 @@ AC_INIT(sim_client.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_CHECK_HEADERS(stdlib.h)
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 5e49427131..5d0cbc1295 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:48:58 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add KRB5_LIBRARIES and USE_KADM_LIBRARY.
+
 Wed Jun 28 13:13:34 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* sim_server.c: Include <string.h> for memcpy definitions.
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 5f4d33f4e8..bd8a413172 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,17 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-sim_server: sim_server.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sim_server sim_server.o $(KLIB) $(LIBS)
+sim_server: sim_server.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sim_server sim_server.o $(LIBS)
 
 sim_server.o:	$(srcdir)/sim_server.c
 
diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in
index 8823e38eee..2eaa6ce89d 100644
--- a/src/appl/simple/server/configure.in
+++ b/src/appl/simple/server/configure.in
@@ -1,5 +1,7 @@
 AC_INIT(sim_server.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE