Reorganize library logic and use LDFLAGS from configure

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

18 files changed, 52 insertions, 90 deletions

diff --git a/src/admin/aname/ChangeLog b/src/admin/aname/ChangeLog
index a8239d450..43736767d 100644
--- a/src/admin/aname/ChangeLog
+++ b/src/admin/aname/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:34:15 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add KRB5_LIBRARIES.
+
+
 Fri Jun 30 14:28:20 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* kdb5_anadd.c - Add ability to select between Berkeley and DBM format
 		at compile time.
diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index 7e25cbf78..1de452a4b 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -1,25 +1,12 @@
 DBFLAGS=@DBFLAGS@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DBFLAGS)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
-KDBLIB=-lkdb5
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
-
 all:: kdb5_anadd
 
 kdb5_anadd: kdb5_anadd.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_anadd kdb5_anadd.o $(LOCAL_LIBRARIES) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_anadd kdb5_anadd.o $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) kdb5_anadd $(DESTDIR)$(ADMIN_BINDIR)/kdb5_anadd
diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in
index 6164b5784..397536e55 100644
--- a/src/admin/aname/configure.in
+++ b/src/admin/aname/configure.in
@@ -35,5 +35,6 @@ else
 fi
 AC_SUBST(DBFLAGS)dnl
 dnl
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index 406bb5bb0..711fb80a7 100644
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:35:07 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add appropriate USE_<mumble> and KRB5_LIBRARIES.
+
+
 Thu Jun 15 15:27:36 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/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index f23609805..9a2997154 100644
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -1,28 +1,13 @@
-KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
-KDB4_LIB = @KDB4_LIB@
-
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
-KDBLIB=-lkdb5
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a
 
 all::
 
-KLIB = -lkrb5 $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KDB4_LIB) $(KLIB) 
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV
 
 all:: kdb5_convert
 
 kdb5_convert: kdb5_convert.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_convert kdb5_convert.o $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 77b90e890..72f2ed5df 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -3,5 +3,9 @@ CONFIG_RULES
 AC_PROG_INSTALL
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
+USE_KDB5_LIBRARY
+USE_KDB4_LIBRARY
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog
index e31200cd4..0ccc3886b 100644
--- a/src/admin/create/ChangeLog
+++ b/src/admin/create/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:36:00 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.
+
+
 Fri Jun 30 14:30:07 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/admin/create/Makefile.in b/src/admin/create/Makefile.in
index 3491d9ffe..945a55301 100644
--- a/src/admin/create/Makefile.in
+++ b/src/admin/create/Makefile.in
@@ -1,23 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KDBLIB=-lkdb5 
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
-
-all::
-
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
 
 all:: kdb5_create
 
 kdb5_create: kdb5_create.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_create kdb5_create.o $(LOCAL_LIBRARIES) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_create kdb5_create.o $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) kdb5_create $(DESTDIR)$(ADMIN_BINDIR)/kdb5_create
diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in
index 4ac47284b..7defabde6 100644
--- a/src/admin/create/configure.in
+++ b/src/admin/create/configure.in
@@ -15,5 +15,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/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog
index e7dc6e242..d70a699f8 100644
--- a/src/admin/destroy/ChangeLog
+++ b/src/admin/destroy/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:36:45 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.
+
+
 Fri Jun 30 14:30:49 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/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in
index 05770f350..08e52fe63 100644
--- a/src/admin/destroy/Makefile.in
+++ b/src/admin/destroy/Makefile.in
@@ -1,23 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KDBLIB=-lkdb5 
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
-
-all::
-
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
 
 all:: kdb5_destroy
 
 kdb5_destroy: kdb5_destroy.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_destroy kdb5_destroy.o $(LOCAL_LIBRARIES) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_destroy kdb5_destroy.o $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) kdb5_destroy ${DESTDIR}$(ADMIN_BINDIR)/kdb5_destroy
diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in
index 09c818303..7c47164e6 100644
--- a/src/admin/destroy/configure.in
+++ b/src/admin/destroy/configure.in
@@ -15,5 +15,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/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index ca2ffa1f4..d0259cb48 100644
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:38:00 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add USE_<mumble> and KRB5_LIBRARIES.
+
+
 Thu Jun 15 15:34:59 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/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index 9b53cb6ac..308b63391 100644
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -1,21 +1,7 @@
-KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
-KDB4_LIB = @KDB4_LIB@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-SSLIB=$(BUILDTOP)/util/ss/libss.a
-DBMLIB=
-KDBLIB=-lkdb5 
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
 
 all::
 
-KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(SSLIB) $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KDB4_LIB) $(KLIB)
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV
 
 OBJS= kdb5_edit.o \
@@ -38,7 +24,7 @@ SRCS= $(srcdir)/kdb5_edit.c \
 all:: kdb5_edit
 
 kdb5_edit: kdb5_edit.o $(DEPLIBS) $(OBJS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_edit $(OBJS) $(LOCAL_LIBRARIES) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_edit $(OBJS) $(LIBS)
 
 getdate.c getdate.h: getdate.y
 	$(RM) getdate.c getdate.h y.tab.*
diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index 92b929e71..91581d0ba 100644
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -10,5 +10,10 @@ AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 AC_HAVE_FUNCS(getcwd)
 SS_RULES
+USE_KDB5_LIBRARY
+USE_KDB4_LIBRARY
+USE_KRB4_LIBRARY
+USE_SS_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog
index 5393e7a2b..65ca88b74 100644
--- a/src/admin/stash/ChangeLog
+++ b/src/admin/stash/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:38:50 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.
+
+
 Fri Jun 30 14:31:23 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/admin/stash/Makefile.in b/src/admin/stash/Makefile.in
index 0ccbee0a8..d98dd1ffa 100644
--- a/src/admin/stash/Makefile.in
+++ b/src/admin/stash/Makefile.in
@@ -1,23 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KDBLIB=-lkdb5 
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
-
-all::
-
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
 
 all:: kdb5_stash
 
 kdb5_stash: kdb5_stash.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_stash kdb5_stash.o $(LOCAL_LIBRARIES) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_stash kdb5_stash.o $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) kdb5_stash ${DESTDIR}$(ADMIN_BINDIR)/kdb5_stash
diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in
index 32aefe487..eb8220e6d 100644
--- a/src/admin/stash/configure.in
+++ b/src/admin/stash/configure.in
@@ -15,5 +15,7 @@ else
 fi
 AC_SUBST(DBFLAGS)dnl
 dnl
+USE_KDB5_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE