Reorganize library logic and use LDFLAGS from configure

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

9 files changed, 30 insertions, 37 deletions

diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog
index 5612c6eb2..6c7c57c84 100644
--- a/src/kadmin/kpasswd/ChangeLog
+++ b/src/kadmin/kpasswd/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:59:51 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add USE_KADM_LIBRARY and KRB5_LIBRARIES.
+
 Thu Jun 15 17:53:15 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/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in
index 8adb7b48d..aed4a7d0a 100644
--- a/src/kadmin/kpasswd/Makefile.in
+++ b/src/kadmin/kpasswd/Makefile.in
@@ -1,14 +1,7 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-SSLIB=$(BUILDTOP)/util/ss/libss.a
 
 all::
 
-KLIB = -lkadm -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) 
-
 SRCS = \
 	$(srcdir)/kpasswd.c
 
@@ -18,8 +11,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) kpasswd ${DESTDIR}$(CLIENT_BINDIR)/kpasswd
diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in
index 6399d3cc4..1ac29a588 100644
--- a/src/kadmin/kpasswd/configure.in
+++ b/src/kadmin/kpasswd/configure.in
@@ -2,5 +2,7 @@ AC_INIT(kpasswd.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 ET_RULES
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/v5client/ChangeLog b/src/kadmin/v5client/ChangeLog
index f1af638ee..c94731af7 100644
--- a/src/kadmin/v5client/ChangeLog
+++ b/src/kadmin/v5client/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 16:00:34 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:33:31 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* kadmin5.c - Add usage of compile(3) regular expression interfaces
 		if present.  Also call regfree if using regcomp.
diff --git a/src/kadmin/v5client/Makefile.in b/src/kadmin/v5client/Makefile.in
index 92ae11e26..50bac0f92 100644
--- a/src/kadmin/v5client/Makefile.in
+++ b/src/kadmin/v5client/Makefile.in
@@ -1,21 +1,7 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = 
-
-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 = -lkrb5 $(KRB4_LIB) -lcrypto $(SSLIB) $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB)
-
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) $(DEPKADMLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KADMLIB) $(KLIB)
 LOCALINCLUDE=
 
 OBJS= kadmin5.o \
@@ -32,7 +18,7 @@ SRCS= $(srcdir)/kadmin5.c \
 all:: kadmin5
 
 kadmin5: kadmin5.o $(DEPLIBS) $(OBJS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kadmin5 $(OBJS) $(LOCAL_LIBRARIES) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kadmin5 $(OBJS) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) kadmin5 ${DESTDIR}$(ADMIN_BINDIR)/kadmin5
diff --git a/src/kadmin/v5client/configure.in b/src/kadmin/v5client/configure.in
index e8dab2ab4..0815bbd42 100644
--- a/src/kadmin/v5client/configure.in
+++ b/src/kadmin/v5client/configure.in
@@ -20,5 +20,10 @@ else
 fi
 AC_SUBST(DBFLAGS)dnl
 dnl
+USE_KADM_LIBRARY
+USE_KDB5_LIBRARY
+USE_KRB4_LIBRARY
+USE_SS_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog
index ae6d217c9..0f8e1c60c 100644
--- a/src/kadmin/v5server/ChangeLog
+++ b/src/kadmin/v5server/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 16:01:37 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:35:00 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* srv_main.c - Instead of moving up the initialization and calls to
 		key_init() before the call to daemon(), have daemon() not
diff --git a/src/kadmin/v5server/Makefile.in b/src/kadmin/v5server/Makefile.in
index bde3cb18e..ef9efb898 100644
--- a/src/kadmin/v5server/Makefile.in
+++ b/src/kadmin/v5server/Makefile.in
@@ -1,18 +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) $(KDBLIB) -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB)
-DEPKLIB = $(DEPKADMLIB) $(DEPKDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB)
-
 SRCS = \
 	$(srcdir)/srv_main.c $(srcdir)/srv_key.c  \
 	$(srcdir)/srv_acl.c $(srcdir)/srv_output.c $(srcdir)/srv_net.c \
@@ -25,8 +14,8 @@ OBJS = \
 
 all::	kadmind5
 
-kadmind5: $(KDBDEPLIB) $(OBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kadmind5 $(OBJS) $(KLIB) $(LIBS)
+kadmind5: $(OBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kadmind5 $(OBJS) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(C)kadmind5 ${DESTDIR}$(SERVER_BINDIR)$(S)kadmind5
diff --git a/src/kadmin/v5server/configure.in b/src/kadmin/v5server/configure.in
index ad020ee05..381796717 100644
--- a/src/kadmin/v5server/configure.in
+++ b/src/kadmin/v5server/configure.in
@@ -22,5 +22,8 @@ else
 fi
 AC_SUBST(DBFLAGS)dnl
 dnl
+USE_KADM_LIBRARY
+USE_KDB5_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE