Reorganize library logic and use LDFLAGS from configure

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

diff --git a/src/admin/aname/ChangeLog b/src/admin/aname/ChangeLog
index a8239d450daeec3b4e4903c5d7f7ca2fa13f0626..43736767dd5cf40a572fb707d1a0d71ebf9fbc0b 100644 (file)
--- 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 7e25cbf78b4be6244c9ff0883107c137e8aee9ec..1de452a4b981014d2111e525c093c455e3e1fc3a 100644 (file)
--- 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 6164b57842797ad00f6fe0d7b389610b72e0aecd..397536e557ff8590da6304131dfbc37caaf123bf 100644 (file)
--- 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 406bb5bb0affc6157eeebb87735c3aa88c55fe9d..711fb80a748d64bf84ee16f83433c106c7b0de24 100644 (file)
--- 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 f236098058af3abe77ba6fd10018bf7709f7a361..9a29971549e5a3486b5005d300c7c88824f1ded3 100644 (file)
--- 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 77b90e890c451f47369c4efa2f8be9fd81a8c46e..72f2ed5dfc6dc879fb799a426f990897a9c393e9 100644 (file)
--- 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 e31200cd4df0e134868b0be0380d2f0ce751d6dd..0ccc3886b8745f7bfc64323abdcc3e48bfcdb7de 100644 (file)
--- 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 3491d9ffe697f3c9cf6baf97a9bcfeb12832310f..945a553019c04a27a11f1984f514fe6fbc036bfb 100644 (file)
--- 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 4ac47284b568217d0e78dda7e668a82b6acc5fa1..7defabde6074fe090f10c84a2fd7b0414d811a8a 100644 (file)
--- 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 e7dc6e242139b9efd20cb3e5431eaf4283784166..d70a699f898d109e291b59744bc341a68ec5a2f0 100644 (file)
--- 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 05770f3504eb1fcf25ae2782fe25ea09ceaf454d..08e52fe63939875b9a3ff2168327bc4e757abedb 100644 (file)
--- 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 09c818303c4c8216ccb72f148e0c6f808d7fd295..7c47164e603b5df9488b77c91644adb84127a43c 100644 (file)
--- 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 ca2ffa1f46f189547b1859037df57b99c6586a29..d0259cb48f614a81ff946e7e1c5256b23263e830 100644 (file)
--- 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 9b53cb6aca82c0831cd1042f9ba5b2cc44be47b0..308b63391a34f0c2efd3e4588efc47993b5ea478 100644 (file)
--- 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 92b929e7127b564c5cd0a7703a7b77cbca403694..91581d0ba2418fdc33b4ad4b8de2ee20d767ba28 100644 (file)
--- 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 5393e7a2b8e0d649aaf011bb83b619a747cc9428..65ca88b7426025cffca9067c19fbb88512d5f996 100644 (file)
--- 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 0ccbee0a816cec56b35e3afffb16d37b488d8bad..d98dd1ffa2fd44722ead5babddd6bcd2d402de1e 100644 (file)
--- 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 32aefe487ee4ec9185fd57a9599b658351498ed9..eb8220e6d0a455e842dcd6c119f374b733d7f561 100644 (file)
--- 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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 4b03944c1bcfef4852a43f052a62f7aa114da768..fec8229b8739cdd445a30c9107b0a8e0c2d11e90 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:40:42 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove all explcitit library handling.
+       * configure.in - Add USE_<mumble> and KRB5_LIBRARIES.
+
 Wed Jul  5 20:03:37 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * krcp.c, krlogin.c, krlogind.c, krshd.c, login.c: Remove

diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 2d78cd37181e4f9421490ad5e7365cc2a39fab69..3445ee415cb314e6842a085f0c21ea8330be4137 100644 (file)
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -2,10 +2,6 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DEFINES)
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV
 SETENVSRC=@SETENVSRC@
 SETENVOBJ=@SETENVOBJ@
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
-KLIB = -lkadm -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 LOGINLIBS = @LOGINLIBS@
 LIBOBJS=@LIBOBJS@
@@ -31,36 +27,36 @@ all:: rsh rcp rlogin krshd krlogind login.krb5
 clean:: 
        $(RM) rsh rcp rlogin krshd krlogind login.krb5
 
-rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) rsh $(DESTDIR)$(CLIENT_BINDIR)/rsh
        $(INSTALL_DATA) $(srcdir)/rsh.M ${DESTDIR}$(CLIENT_MANDIR)/rsh.1
 
-rcp: krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+rcp: krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) rcp $(DESTDIR)$(CLIENT_BINDIR)/rcp
        $(INSTALL_DATA) $(srcdir)/rcp.M ${DESTDIR}$(CLIENT_MANDIR)/rcp.1
 
-rlogin: krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+rlogin: krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) rlogin $(DESTDIR)$(CLIENT_BINDIR)/rlogin
        $(INSTALL_DATA) $(srcdir)/rlogin.M ${DESTDIR}$(CLIENT_MANDIR)/rlogin.1
 
-krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) krshd $(DESTDIR)$(SERVER_BINDIR)/krshd
        $(INSTALL_DATA) $(srcdir)/krshd.M ${DESTDIR}$(SERVER_MANDIR)/krshd.8
 
-krlogind: krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+krlogind: krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind
@@ -70,8 +66,8 @@ install::
 # We load the libraries twice here since des425 has a dependency on 
 # krb5_read_passwrd in krb5.a.  Sigh, circular references.
 #
-login.krb5: login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KLIB) $(LIBS) $(LOGINLIBS)
+login.krb5: login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(LIBS) $(LOGINLIBS)
 
 install::
        $(INSTALL_PROGRAM) login.krb5 $(DESTDIR)$(SERVER_BINDIR)/login.krb5

diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index c12df133d0aadfe43aa4024e98ab2f9c404e85dc..b68eeb59f39b0d262d3644b855bf02c449a7daaa 100644 (file)
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -154,5 +154,8 @@ dnl
 dnl
 ADD_DEF(-DKERBEROS)
 AC_CONST
+USE_KADM_LIBRARY
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index d8cf29f92d5bc31556986d69c4bbb2f0b1183bff..bb2ec0d8b4aa1e0e346bc668cebf7b2b159c968c 100644 (file)
--- 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 a04d03b21b5c8cb52d332c5cc38c4b36ef54403e..12ee366e5e935003af8a795560c447255c55ae78 100644 (file)
--- 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 def5fa43839cba4f093805f16b91d17580fc453d..5987e3afd8654b33fdef2a10a128964325781e08 100644 (file)
--- 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

diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog
index 8ecca7dc4f9e8f4b9127ec52293092c30c2d1133..46bf2e886cebce6854260f2173bc3e4001996865 100644 (file)
--- a/src/appl/mailquery/ChangeLog
+++ b/src/appl/mailquery/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:43:24 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove all explicit library handling.
+       * configure.in - Add KRB5_LIBRARIES.
+
 Tue Jun 20 14:29:23 1995  Tom Yu  (tlyu@dragons-lair)
 
        * poplib.c: HAS_STDLIB_H -> HAVE_STDLIB_H

diff --git a/src/appl/mailquery/Makefile.in b/src/appl/mailquery/Makefile.in
index 8017aaf9f854fcb53e1d769760cbfb7610b6edc6..eb740403ee1c4d4477187d3dd6e5767cb6f04cc4 100644 (file)
--- a/src/appl/mailquery/Makefile.in
+++ b/src/appl/mailquery/Makefile.in
@@ -1,16 +1,13 @@
 CFLAGS = $(CCOPTS) -DKPOP -DKRB5 $(DEFS) $(LOCALINCLUDE)
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
 HESIODLIB =
+LOCAL_LIBRARIES = $(HESIODLIB)
+DEPLOCAL_LIBRARIES = $(HESIODLIB)
 
-mailquery: mailquery.o poplib.o $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o mailquery mailquery.o poplib.o $(KLIB) \
-               $(HESIODLIB) $(LIBS)
+mailquery: mailquery.o poplib.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o mailquery mailquery.o poplib.o $(LIBS)
 
 mailquery.o:   $(srcdir)/mailquery.c
 poplib.o:      $(srcdir)/poplib.c

diff --git a/src/appl/mailquery/configure.in b/src/appl/mailquery/configure.in
index b49dfc0f2afb57a2ada6e0ef9c5e168c3635684c..c93e62d3466fb342883400a55f86626f5b60befe 100644 (file)
--- a/src/appl/mailquery/configure.in
+++ b/src/appl/mailquery/configure.in
@@ -3,5 +3,6 @@ CONFIG_RULES
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(unistd.h stdlib.h)
 AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR))
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/appl/movemail/ChangeLog b/src/appl/movemail/ChangeLog
index bbf68952f4b0e00c711edb2a2adb076cf23407a6..4ab3f22f19de5317ff0e26ff66febe573105c971 100644 (file)
--- a/src/appl/movemail/ChangeLog
+++ b/src/appl/movemail/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:44:13 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove all explicit library handling and LDFLAGS.
+       * configure.in - add KRB5_LIBRARIES.
+
 Tue Jun 20 13:09:51 1995  Tom Yu  (tlyu@dragons-lair)
 
        * movemail.c: USE_STRING_H -> HAVE_STRING_H; fix HAVE_STLIB_H to

diff --git a/src/appl/movemail/Makefile.in b/src/appl/movemail/Makefile.in
index fcbd2c68926cf459835bc7f04156a999e4d357e7..838b42d0001350450d94bca577dda40164a3fb87 100644 (file)
--- a/src/appl/movemail/Makefile.in
+++ b/src/appl/movemail/Makefile.in
@@ -1,18 +1,15 @@
 CFLAGS = $(CCOPTS) -DKERBEROS -DKRB5 -DMAIL_USE_POP $(DEFS) $(LOCALINCLUDE)
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-LDFLAGS = -g
 
 OBJS = movemail.o movemail-mmdf.o
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
 HESIODLIB = 
+LOCAL_LIBRARIES = $(HESIODLIB)
+DEPLOCAL_LIBRARIES = $(HESIODLIB)
 
-movemail: movemail.o $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o movemail movemail.o $(KLIB) $(HESIODLIB) $(LIBS)
+movemail: movemail.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o movemail movemail.o $(LIBS)
 
 all:: movemail
 

diff --git a/src/appl/movemail/configure.in b/src/appl/movemail/configure.in
index f6e2469203feeeb1fd37779cfcd2513df4c3c76f..c23366526ac057fcee889c6f429e8cf00927e322 100644 (file)
--- a/src/appl/movemail/configure.in
+++ b/src/appl/movemail/configure.in
@@ -3,5 +3,6 @@ CONFIG_RULES
 AC_PROG_INSTALL
 CHECK_FCNTL
 AC_HAVE_HEADERS(stdlib.h string.h unistd.h)
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog
index 7a422caa18f59bbcc692333b4e9165193c65f05b..8f533d318592fe8718adc6543f0d05323fe78a69 100644 (file)
--- a/src/appl/popper/ChangeLog
+++ b/src/appl/popper/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:44:56 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove all explicit library handling.
+       * configure.in - add USE_KADM_LIBRARY and KRB5_LIBRARIES.
+
+
 Thu Jun 15 17:38:06 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/popper/Makefile.in b/src/appl/popper/Makefile.in
index b35f3810e2186ad468d3c8d1af01181f234cfc74..5d36a017241173850246b73babe9d1ec4b11e1b9 100644 (file)
--- a/src/appl/popper/Makefile.in
+++ b/src/appl/popper/Makefile.in
@@ -9,13 +9,8 @@ CFLAGS = $(CCOPTS) -DMAILDIR=\"/usr/spool/pop\" -DKERBEROS -DKRB5 -DDEBUG $(DEFS
 
 SERVER_MANSUFFIX = 8
 
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-
 all::
 
-KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
 OBJS           =       pop_dele.o pop_dropcopy.o pop_dropinfo.o \
                        pop_get_command.o pop_get_subcommand.o pop_init.o \
                        pop_last.o pop_list.o pop_log.o pop_lower.o \
@@ -23,8 +18,8 @@ OBJS          =       pop_dele.o pop_dropcopy.o pop_dropinfo.o \
                        pop_rset.o pop_send.o pop_stat.o pop_updt.o \
                        pop_user.o pop_xtnd.o pop_xmit.o popper.o
 
-popper: $(OBJS) $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o popper $(OBJS) $(KLIB) $(LIBS)
+popper: $(OBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o popper $(OBJS) $(LIBS)
 
 all:: popper
 

diff --git a/src/appl/popper/configure.in b/src/appl/popper/configure.in
index 23da3adb66b96646e65c6b04a8267e456dd5fb3a..73234293ac9e820d2b28878fcca3593f5fb9c855 100644 (file)
--- a/src/appl/popper/configure.in
+++ b/src/appl/popper/configure.in
@@ -11,5 +11,7 @@ AC_HAVE_HEADERS(strings.h)
 AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))
 AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H))
 
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 435b8fce1e2b7a39d489c9b7ba5f09d849d45c42..b46458339a911ef30173d4db2665208e8f44aca6 100644 (file)
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:46:11 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove all explicit library handling and LDFLAGS.
+       * configure.in - Add KRB5_LIBRARIES.
+
 Tue Jun 20 13:16:10 1995  Tom Yu  (tlyu@dragons-lair)
 
        * configure.in: added missing check for stdlib.h

diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 8651c01500d65ed7aac317be52c4f7469c91f45b..40587b20e92b12bd1882bdcb10022db5a5a6ebaf 100644 (file)
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,15 +1,9 @@
 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)
-
-sclient: sclient.o $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(KLIB) $(LIBS)
+sclient: sclient.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(LIBS)
 
 sclient.o:     $(srcdir)/sclient.c
 

diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 02ecb65146403cfe167543401e17ae8495ce5afa..3683371e7ea257ee706cd511914f8e28763be8fc 100644 (file)
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/configure.in
@@ -2,5 +2,6 @@ AC_INIT(sclient.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/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index d6bf4a7c417e00e34ab6f56f4201cae4d1a45162..bee24176927125ca5d72a9173a258ae8ddfde9a1 100644 (file)
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:47:04 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.
+
+
 Thu Jun 15 17:39:17 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/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 92eb2cdeb2113187aedf82a34dc055b20f42a054..84e6a0e589ab479be1b7682d01b891ba5be8f8fd 100644 (file)
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,15 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
-sserver: sserver.o $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(KLIB) $(LIBS)
+sserver: sserver.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(LIBS)
 
 sserver.o:     $(srcdir)/sserver.c
 

diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index 82a884d7a2163d267cf9e3d36aef425eebcc01d0..c0089c397df1de9c219434ee591ae25819490f95 100644 (file)
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/configure.in
@@ -1,5 +1,7 @@
 AC_INIT(sserver.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index c07b9e9f82313bd20847ded1f0ad51138a9843fb..321938a22d7ba6557d5585a1fead7ae757d2b8c1 100644 (file)
--- 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 f6ac698a3d7332bcacb3d0ac4a7a9f253d957e2a..0424a3ee4d69eec837e9fd46b57bdf920f6f2d99 100644 (file)
--- 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 ce69ddf9b501d888bc347e2b045fcecd6991efcf..657e99f367df51433423464b1e2a9be000873296 100644 (file)
--- 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 5e49427131e6f99b6fa9b091d176c1bd2742b837..5d0cbc129577197acf35fb535fe6dfe1266ceceb 100644 (file)
--- 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 5f4d33f4e8db689c297fe94736ee91443ac234f5..bd8a413172bbaf9ae30c4d1804972ae84943f492 100644 (file)
--- 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 8823e38eee52939422c31998491c47df6fcc793f..2eaa6ce89d9dc0da1eaef4156930db01c6c0d28b 100644 (file)
--- 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

diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index ac5507759545f3d44654e19e7ba7575e611ff5d8..49f9453ad527a5a2155d6e7ce46dfffb6bf3a363 100644 (file)
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:49:55 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove explicit library handling.
+       * configure.in - Add USE_KRB4_LIBRARY and KRB5_LIBRARIES.
+
 Sun Jul  2 04:19:48 1995  Tom Yu  <tlyu@lothlorien.MIT.EDU>
 
        * commands.c: rename setmode() and clearmode() to tel_setmode()

diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 59968ec73d94f6e27932b7c1f09839757852e42f..f58ceba518fb73bbd6d16b20c71f52d4672391a3 100644 (file)
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -25,10 +25,6 @@ OTHERDEFS=-DLINEMODE -DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 LOCALINCLUDES=-I.. -I$(srcdir)/..
 CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
-KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 SRCS=  commands.c main.c network.c ring.c \
        sys_bsd.c telnet.c terminal.c \
@@ -42,8 +38,8 @@ OBJS= authenc.o commands.o main.o network.o ring.o sys_bsd.o \
 
 all:: telnet
 
-telnet:        $(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a
-       $(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+telnet:        $(OBJS) $(DEPLIBS) ../libtelnet/libtelnet.a
+       $(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(LIBS)
 
 clean::
        $(RM) telnet

diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index e3ba0cc5278cbe5edd8a4e7a8310a9ac30c02891..067a5d092e2384536e7097532bb78f38c138bfb6 100644 (file)
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -32,5 +32,7 @@ else
        AC_MSG_RESULT(Kerberos 4 authentication enabled)
        AC_DEFINE(KRB4)
 fi
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 9203e16fe152989b8a6abbee24493607608f06bd..11508143f292d9fb16bc3854bf3b9cb2354cde2d 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:51:03 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove explicit library handling.
+       * configure.in - Add USE_{KRB4,KADM}_LIBRARY and KRB5_LIBRARIES.
+
 Tue Jun 20 14:25:01 1995  Tom Yu  (tlyu@dragons-lair)
 
        * defs.h: NO_STRING_H -> HAVE_STRING_H

diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index 0bc4f9b2c6be579ef09c93a5e2c1c850bc36f1ae..7fe0c160f1b2a85cfe0447dde0a1941e809460d2 100644 (file)
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -25,10 +25,6 @@ OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 LOCALINCLUDES=-I.. -I$(srcdir)/..
 CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
-KLIB = -lkadm -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 SRCS=  $(srcdir)/telnetd.c \
        $(srcdir)/state.c \
@@ -51,8 +47,8 @@ OBJS= telnetd.o \
 
 all:: telnetd
 
-telnetd: $(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a
-       $(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+telnetd: $(OBJS) $(DEPLIBS) ../libtelnet/libtelnet.a
+       $(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(LIBS)
 
 clean::
        $(RM) telnetd

diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index 83a111927835acf295eb8f4449b1b6e66ca7aca4..26eba78c5497e3166d730bb783db5f363e07b6d8 100644 (file)
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -40,5 +40,8 @@ AC_MSG_RESULT($krb5_cv_sys_setpgrp_two)
 if test $krb5_cv_sys_setpgrp_two = yes; then
   AC_DEFINE(SETPGRP_TWOARG)
 fi
+USE_KADM_LIBRARY
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index 020fef29fb02f0a459b364c566759fa1e3fbbc6f..7d6597ea2ab79cfb65f18d22cd0c341266685279 100644 (file)
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:51:45 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove explicit library handling and LDFLAGS.
+       * configure.in - Add KRB5_LIBRARIES.
+
+
 Thu Jun 15 17:44:23 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/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index b7ef965682c02fd7819ac602e0071dcbece834b7..757522ed9477161ef0378c0df33218f4f68c0762 100644 (file)
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,15 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
-uuclient: client.o $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o uuclient client.o $(KLIB) $(LIBS)
+uuclient: client.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o uuclient client.o $(LIBS)
 
 client.o:      $(srcdir)/client.c
 
@@ -19,8 +13,8 @@ all:: uuclient
 clean::
        $(RM) client.o uuclient
 
-uuserver: server.o $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o uuserver server.o $(KLIB) $(LIBS)
+uuserver: server.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o uuserver server.o $(LIBS)
 
 server.o:      $(srcdir)/server.c
 

diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in
index fe538ffe89c837d3599d4641c798cebad485e900..bdb4228ec1680d2086573f4d90016c3cf8111021 100644 (file)
--- a/src/appl/user_user/configure.in
+++ b/src/appl/user_user/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(client.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 5d27822649522f2c78fa4980c9e3b49b4033bec5..76be2b4c2ce4b05b9006a4ff8ce9d4f0e8f7f791 100644 (file)
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:52:51 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove explicit library handling and LDFLAGS..
+       * configure.in - Add KRB5_LIBRARIES.
+
+
 Thu Jun 15 17:45:03 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/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index f911d4703f532e678b845940a28e7f26cb819c23..bf13ee7e3136921e8f3ca761ee6332bd4f8ca44a 100644 (file)
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -1,15 +1,9 @@
 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)
-
-kdestroy: kdestroy.o $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o kdestroy kdestroy.o $(KLIB) $(LIBS)
+kdestroy: kdestroy.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o kdestroy kdestroy.o $(LIBS)
 
 kdestroy.o:    $(srcdir)/kdestroy.c
 

diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in
index 865124d3b34901039d7bf0accb9f77b88280387c..ec61f106acbe684ad836df859b3fdb49054dc919 100644 (file)
--- a/src/clients/kdestroy/configure.in
+++ b/src/clients/kdestroy/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(kdestroy.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index f8ca6cbae1b0757373d0f24fcb64eb528280e7eb..6e39921bdba5e6b9d55a2cd71286775cc0c3723c 100644 (file)
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:53:29 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove explicit library handling.
+       * configure.in - Add KRB5_LIBRARIES.
+
+
 Thu Jun 15 17:45:47 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/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index e1b9737c13ee726beb9d10252892c35526361878..402b67283f5f6cd685a3a47be98829feade5857b 100644 (file)
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -1,14 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
-kinit: kinit.o $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) $(LDFLAGS) -o kinit kinit.o $(KLIB) $(LIBS)
+kinit: kinit.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) $(LDFLAGS) -o kinit kinit.o $(LIBS)
 
 kinit.o:       $(srcdir)/kinit.c
 

diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in
index e4e3977708f893e2cdc8e854f577f8866d16a951..0b6b9df567063179d7eb0f91231e0f6b3bc2d605 100644 (file)
--- a/src/clients/kinit/configure.in
+++ b/src/clients/kinit/configure.in
@@ -2,5 +2,6 @@ AC_INIT(kinit.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(pwd.h)
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index cd72596062f5c161fa214bfbac913dc3b52290c1..44aa340191d6fd3567a8d1c8ce76615d4aef21e3 100644 (file)
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:54:35 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove explicit library handling and LDFLAGS.
+       * configure.in - Add KRB5_LIBRARIES.
+
 Wed Jun 21 10:37:01 1995    <tytso@rsx-11.mit.edu>
 
        * klist.c: Change PROTOTYPE -> KRB5_PROTOTYPE

diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 15d003326f24eced8314b47c7798f8425c2dd06b..61e32659f3619031eb5bd08d1c12f222c525578f 100644 (file)
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,15 +1,9 @@
 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)
-
-klist: klist.o $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o klist klist.o $(KLIB) $(LIBS)
+klist: klist.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o klist klist.o $(LIBS)
 
 klist.o:       $(srcdir)/klist.c
 

diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in
index 1022a8f908045e6282f1747d3873bf4d7a7e9058..7a0e584d6862f67b1f2a9f0d62855792dbcc9a1a 100644 (file)
--- a/src/clients/klist/configure.in
+++ b/src/clients/klist/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(klist.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 2388f1f60dfb3210729a5c4246a36d694e5c3e74..361e0c28936d4125e02bc412e8bebd14d52715fa 100644 (file)
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:55:14 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove explicit library handling and LDFLAGS.
+       * configure.in - Add USE_KADM_LIBRARY and KRB5_LIBRARIES.
+
 Thu Jul  6 17:30:49 1995  Tom Yu  <tlyu@lothlorien.MIT.EDU>
 
        * krb_auth_su.c (krb5_get_tkt_via_passwd): Pass context to

diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index 7a878ce6474e8d5a1ed716e551ac3645e0d93e90..43a3125651a393381a6bf075281f82567d24d41f 100644 (file)
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -1,8 +1,5 @@
 DEFINES = -DLOCAL_REALM='"."' -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
 CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 SRCS = \
        $(srcdir)/krb_auth_su.c \
@@ -19,11 +16,8 @@ OBJS = \
 
 all:: ksu
 
-KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-ksu: $(OBJS) $(DEPKLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o ksu $(OBJS) $(KLIB) $(LIBS)
+ksu: $(OBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o ksu $(OBJS) $(LIBS)
 
 clean::
        $(RM) ksu

diff --git a/src/clients/ksu/configure.in b/src/clients/ksu/configure.in
index ff03dcd4efbfc8efd3b5ce1fc8822d1af47f01e2..62847f5570983fe6e6b14ee5cadd56fd591b757d 100644 (file)
--- a/src/clients/ksu/configure.in
+++ b/src/clients/ksu/configure.in
@@ -5,5 +5,7 @@ AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 AC_CHECK_HEADERS(stdarg.h)
 AC_CHECK_FUNCS(getusershell)
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin.old/client/ChangeLog b/src/kadmin.old/client/ChangeLog
index 63c3eadbdb5b56b0b27d44a6308534e55e532ca8..508e7a5a222e0130ec581c4f34c578520d2b5ec0 100644 (file)
--- 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 2b0adb75c0f32fec7df71cc81f139383ef92546c..42addc6a1881a208925b238a6f1ff2a631cfd12e 100644 (file)
--- 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 0c6c8f2152b92816ff2f0a14a59d0c2a34f77c4c..33cebc824af1d5d82230a99d758cd5699d4da5c4 100644 (file)
--- 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 33b3b0500541d94aaf8225a70e3d61efbde77381..f1899a1d0a566b7e0acdafee0cd5038a0538ca25 100644 (file)
--- 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 7d4b63cd72d497fcc06d7377bc82ab7e8dfb11d3..a3d0858e62d19f19308795cca36f640d3c32f450 100644 (file)
--- 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 3b58bc3bc9b865640628a26a97da069581e34697..f8710bb33aee6da429d71e3aa224745e73cc7e8f 100644 (file)
--- 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 da2109ff897a0b59b24945d2a100975f6d3a6993..6163ccfd3830c04a3db6b1daffc37050d29b7f32 100644 (file)
--- 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 282dffb1deb4b8f73b29a4077dd0e5fe1905d30c..70c75850a0a0d335ae23b011a187af141c71debc 100644 (file)
--- 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

diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog
index a74a3e1a7449041d407068894624f8d5fa6cab9c..9cf6d7f5b8b118f5973b1dc9ac358d559eeed08d 100644 (file)
--- a/src/kadmin.v4/server/ChangeLog
+++ b/src/kadmin.v4/server/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 16:05:11 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * Makefile.in - Remove all explicit library handling and LDFLAGS.
+       * configure.in - Add USE_<mumble> and KRB5_LIBRARIES.
+
+
 Tue Jun 27 16:05:27 EDT 1995   Paul Park       (pjpark@mit.edu)
        * acl_files.c - Change check for return value from fputs(3) from NULL
                to EOF.  That's what's returned on error.

diff --git a/src/kadmin.v4/server/Makefile.in b/src/kadmin.v4/server/Makefile.in
index 0a1dcb453f583602e0b94ddb96bee7d290beeb61..39c13ee26f0bd2175827ec15dcf3a12da8fda414 100644 (file)
--- a/src/kadmin.v4/server/Makefile.in
+++ b/src/kadmin.v4/server/Makefile.in
@@ -1,16 +1,4 @@
-KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
-KDBLIB=-lkdb5
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a
-
-KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
 
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV -I.
 
@@ -42,7 +30,7 @@ kadm_err.c: kadm_err.et
 kadm_err.h: kadm_err.et
 
 v4kadmind: $(OBJS) $(DEPLIBS)
-       $(LD) $(LDFLAGS) $(LDARGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o v4kadmind $(OBJS) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) v4kadmind ${DESTDIR}$(SERVER_BINDIR)/v4kadmind

diff --git a/src/kadmin.v4/server/configure.in b/src/kadmin.v4/server/configure.in
index 3605d9c83e86958f3a259df22f48abf569ca7ebc..47fffc7df0f50bfb5882361b5b2455433964928f 100644 (file)
--- a/src/kadmin.v4/server/configure.in
+++ b/src/kadmin.v4/server/configure.in
@@ -13,5 +13,8 @@ CHECK_WAIT_TYPE
 CHECK_FCNTL
 CHECK_SIGNALS
 ET_RULES
+USE_KDB5_LIBRARY
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog
index 5612c6eb2ee05aaac4bdf762cebc2211b5ac6472..6c7c57c84ab3d1cdc303f3d213a39bf126c74f76 100644 (file)
--- 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 8adb7b48dd256e9b2b4e0d9eb55fbd25057deff0..aed4a7d0a0e974acc9feb33c9a56b848b7948137 100644 (file)
--- 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 6399d3cc43c07143104efd49279050d908f2615b..1ac29a5883a7f938ced7874a31712dab3c97b9ab 100644 (file)
--- 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 f1af638ee1795557279760ae8fee678e21564ef9..c94731af77c8ddf8de826040868a5b29b570b1bc 100644 (file)
--- 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 92ae11e263ec8d3afaaa628a36a921400f4b37f8..50bac0f92e33d0b8ad9f3c3f9621b6f096b4e52a 100644 (file)
--- 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 e8dab2ab4b6cd16726d16554c94fa1257ec468fb..0815bbd422fa20ed616dea96d8c57d95aca1344f 100644 (file)
--- 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 ae6d217c9f60899d0b1f855ff8f6a34ed69554cd..0f8e1c60c5b9e879413445219fa331d690367f63 100644 (file)
--- 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 bde3cb18e2753b7697581b44382f53d6de794b4c..ef9efb89831759024b6945d1cd385b2ed07ee40f 100644 (file)
--- 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 ad020ee055908048bc9458183e04b50676087262..381796717dfe78510561f7db0c56aa813544f50f 100644 (file)
--- 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

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 0ad336dcc4f641ef43c762bbe06b5d8ddb329fef..99e91114a09322e3f02a718bb788a7ebb038a51f 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -1,16 +1,4 @@
-KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
-
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KDBLIB=-lkdb5 
-KDBDEPLIB=$(TOPLIBD)/libkdb5.a 
-KADMLIB=-lkadm
-KADMDEPLIB=$(TOPLIBD)/libkadm.a
-
-KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
 
 KRB4INCLUDES=-I$(SRCTOP)/include/kerberosIV
 
@@ -55,8 +43,8 @@ kdc5_err.h: kdc5_err.et
 
 kdc5_err.o: kdc5_err.h
 
-krb5kdc: $(OBJS) $(KDBDEPLIB) $(DEPKLIB) $(KADMDEPLIB)
-       $(LD) $(LDFLAGS) $(LDARGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KADMLIB) $(KLIB) $(LIBS)
+krb5kdc: $(OBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o krb5kdc $(OBJS) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc

diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index d3bbc35f5f3af33744b7d6efd992c9aa7104dec8..3effe5dd1090c09a78f8bc76690377ef18f43371 100644 (file)
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -19,5 +19,9 @@ else
 fi
 AC_SUBST(DBFLAGS)dnl
 dnl
+USE_KADM_LIBRARY
+USE_KDB5_LIBRARY
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index f770c79000913446c231970856b9cc5b5b260c8e..42e7869ec48fd411a9e9cb9418c00490497c07c8 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 16:07:21 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:38:56 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/krb524/Makefile.in b/src/krb524/Makefile.in
index fcfa140744afe248a5796bb427770110efaf7533..03805ab005d24dbe281eb880b944932d9fcfb81a 100644 (file)
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -21,21 +21,12 @@
 # $Id$
 
 CFLAGS = $(CCOPTS) -DUSE_MASTER  $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
-
-KDBLIB=-lkdb5 
-KDBDEPLIB=$(TOPLIBD)/libkdb5.a 
 
-KLIB = libkrb524.a -lkrb5 $(KRB4_LIB) -lcrypto \
-       $(COMERRLIB)  
-DEPKLIB = libkrb524.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a \
-       $(COMERRLIB) 
+LOCAL_LIBRARIES = libkrb524.a
+DEPLOCAL_LIBRARIES = libkrb524.a
 
 LOCALINCLUDE= -I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV \
        -I. -I$(srcdir)
@@ -54,14 +45,14 @@ libkrb524.a: $(OBJS)
        $(ARADD) $@ $(OBJS)
        $(RANLIB) $@
 
-test: libkrb524.a test.o $(DEPKDBLIB) $(DEPKLIB)
-       $(LD) -o test $(LDFLAGS) $(LDARGS) test.o $(KDBLIB) $(KLIB) $(LIBS)
+test: libkrb524.a test.o $(DEPLIBS)
+       $(LD) -o test $(LDFLAGS) $(LDARGS) test.o $(LIBS)
 
-krb524d: libkrb524.a krb524d.o $(DEPKDBLIB) $(DEPKLIB)
-       $(LD) -o krb524d krb524d.o $(LDFLAGS) $(LDARGS) $(KDBLIB) $(KLIB) $(LIBS)
+krb524d: krb524d.o $(DEPLIBS)
+       $(LD) -o krb524d krb524d.o $(LDFLAGS) $(LDARGS) $(LIBS)
 
-k524init: libkrb524.a k524init.o $(DEPKLIB)
-       $(LD) -o k524init $(LDFLAGS) $(LDARGS) k524init.o $(KLIB) $(LIBS)
+k524init: k524init.o $(DEPLIBS)
+       $(LD) -o k524init $(LDFLAGS) $(LDARGS) k524init.o $(LIBS)
 
 install::
        $(INSTALL_DATA) libkrb524.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb524.a

diff --git a/src/krb524/configure.in b/src/krb524/configure.in
index d39b4baabe057d97a5bdc9ea092ab60cc3d2a875..916e09560832c5ce734e559e535ae85ee7d2fff9 100644 (file)
--- a/src/krb524/configure.in
+++ b/src/krb524/configure.in
@@ -20,5 +20,8 @@ else
 fi
 AC_SUBST(DBFLAGS)dnl
 dnl
+USE_KDB5_LIBRARY
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE