Reorganize library logic and use LDFLAGS from configure

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

8 files changed, 23 insertions, 37 deletions

diff --git a/src/kadmin.old/client/ChangeLog b/src/kadmin.old/client/ChangeLog
index 63c3eadbd..508e7a5a2 100644
--- a/src/kadmin.old/client/ChangeLog
+++ b/src/kadmin.old/client/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 16:03:02 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add USE_KDB5_LIBRARY  and KRB5_LIBRARIES.
+
 Thu Jul  6 17:28:26 1995  Tom Yu  <tlyu@lothlorien.MIT.EDU>
 
 	* kadmin.c (get_first_ticket): Pass context to os_localaddr.
diff --git a/src/kadmin.old/client/Makefile.in b/src/kadmin.old/client/Makefile.in
index 2b0adb75c..42addc6a1 100644
--- a/src/kadmin.old/client/Makefile.in
+++ b/src/kadmin.old/client/Makefile.in
@@ -1,15 +1,7 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-SSLIB=$(BUILDTOP)/util/ss/libss.a
-KDBLIB=-lkdb5 
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) 
-
 SRCS = \
 	$(srcdir)/kadmin.c \
 	$(srcdir)/kadmin_add.c \
@@ -36,8 +28,8 @@ OBJS = \
 
 all::	kadmin
 
-kadmin: $(KDBDEPLIB) $(OBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kadmin $(OBJS) $(KLIB) $(LIBS)
+kadmin: $(OBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kadmin $(OBJS) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(C)kadmin ${DESTDIR}$(CLIENT_BINDIR)$(S)kadmin_old
diff --git a/src/kadmin.old/client/configure.in b/src/kadmin.old/client/configure.in
index 0c6c8f215..33cebc824 100644
--- a/src/kadmin.old/client/configure.in
+++ b/src/kadmin.old/client/configure.in
@@ -17,5 +17,7 @@ else
 fi
 AC_SUBST(DBFLAGS)dnl
 dnl
+USE_KDB5_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/kpasswd/Makefile.in b/src/kadmin.old/kpasswd/Makefile.in
index 33b3b0500..f1899a1d0 100644
--- a/src/kadmin.old/kpasswd/Makefile.in
+++ b/src/kadmin.old/kpasswd/Makefile.in
@@ -1,15 +1,7 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-SSLIB=$(BUILDTOP)/util/ss/libss.a
-KDBLIB=-lkdb5 
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) 
-
 SRCS = \
 	$(srcdir)/networked.c \
 	$(srcdir)/kpasswd.c
@@ -21,8 +13,8 @@ OBJS = \
 
 all::	kpasswd
 
-kpasswd: $(KDBDEPLIB) $(OBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS)
+kpasswd: $(OBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kpasswd $(OBJS) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(C)kpasswd ${DESTDIR}$(CLIENT_BINDIR)$(S)kpasswd_old
diff --git a/src/kadmin.old/kpasswd/configure.in b/src/kadmin.old/kpasswd/configure.in
index 7d4b63cd7..a3d0858e6 100644
--- a/src/kadmin.old/kpasswd/configure.in
+++ b/src/kadmin.old/kpasswd/configure.in
@@ -19,5 +19,7 @@ else
 fi
 AC_SUBST(DBFLAGS)dnl
 dnl
+USE_KDB5_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog
index 3b58bc3bc..f8710bb33 100644
--- a/src/kadmin.old/server/ChangeLog
+++ b/src/kadmin.old/server/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 16:03:56 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add USE_<mumble> and KRB5_LIBRARIES.
+
+
 Fri Jun 30 14:37:32 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* configure.in - Add --with-dbm to select between Berkeley and DBM
 		KDC database format.
diff --git a/src/kadmin.old/server/Makefile.in b/src/kadmin.old/server/Makefile.in
index da2109ff8..6163ccfd3 100644
--- a/src/kadmin.old/server/Makefile.in
+++ b/src/kadmin.old/server/Makefile.in
@@ -1,22 +1,7 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-SSLIB=$(BUILDTOP)/util/ss/libss.a
-KDBLIB=-lkdb5 
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
-KADMLIB=-lkadm
-DEPKADMLIB=$(TOPLIBD)/libkadm.a
 
 all::
 
-KLIB = $(KADMLIB) -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB)
-DEPKLIB = $(DEPKADMLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB)
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
-
-
 SRCS = \
 	$(srcdir)/adm_server.c \
 	$(srcdir)/adm_parse.c \
@@ -51,8 +36,8 @@ OBJS = \
 
 all::	kadmind
 
-kadmind: $(KDBDEPLIB) $(OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS)
+kadmind: $(OBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kadmind $(OBJS) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(C)kadmind ${DESTDIR}$(SERVER_BINDIR)$(S)kadmind_old
diff --git a/src/kadmin.old/server/configure.in b/src/kadmin.old/server/configure.in
index 282dffb1d..70c75850a 100644
--- a/src/kadmin.old/server/configure.in
+++ b/src/kadmin.old/server/configure.in
@@ -19,5 +19,8 @@ else
 fi
 AC_SUBST(DBFLAGS)dnl
 dnl
+USE_KADM_LIBRARY
+USE_KDB5_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE