diff options
91 files changed, 293 insertions, 339 deletions
diff --git a/src/admin/aname/ChangeLog b/src/admin/aname/ChangeLog index a8239d450d..43736767dd 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 7e25cbf78b..1de452a4b9 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 6164b57842..397536e557 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 406bb5bb0a..711fb80a74 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 f236098058..9a29971549 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 77b90e890c..72f2ed5dfc 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 e31200cd4d..0ccc3886b8 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 3491d9ffe6..945a553019 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 4ac47284b5..7defabde60 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 e7dc6e2421..d70a699f89 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 05770f3504..08e52fe639 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 09c818303c..7c47164e60 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 ca2ffa1f46..d0259cb48f 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 9b53cb6aca..308b63391a 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 92b929e712..91581d0ba2 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 5393e7a2b8..65ca88b742 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 0ccbee0a81..d98dd1ffa2 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 32aefe487e..eb8220e6d0 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 diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 4b03944c1b..fec8229b87 100644 --- 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 2d78cd3718..3445ee415c 100644 --- 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 c12df133d0..b68eeb59f3 100644 --- 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 d8cf29f92d..bb2ec0d8b4 100644 --- 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 a04d03b21b..12ee366e5e 100644 --- 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 def5fa4383..5987e3afd8 100644 --- 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 8ecca7dc4f..46bf2e886c 100644 --- 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 8017aaf9f8..eb740403ee 100644 --- 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 b49dfc0f2a..c93e62d346 100644 --- 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 bbf68952f4..4ab3f22f19 100644 --- 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 fcbd2c6892..838b42d000 100644 --- 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 f6e2469203..c23366526a 100644 --- 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 7a422caa18..8f533d3185 100644 --- 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 b35f3810e2..5d36a01724 100644 --- 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 23da3adb66..73234293ac 100644 --- 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 435b8fce1e..b46458339a 100644 --- 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 8651c01500..40587b20e9 100644 --- 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 02ecb65146..3683371e7e 100644 --- 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 d6bf4a7c41..bee2417692 100644 --- 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 92eb2cdeb2..84e6a0e589 100644 --- 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 82a884d7a2..c0089c397d 100644 --- 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 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 diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog index ac55077595..49f9453ad5 100644 --- 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 59968ec73d..f58ceba518 100644 --- 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 e3ba0cc527..067a5d092e 100644 --- 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 9203e16fe1..11508143f2 100644 --- 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 0bc4f9b2c6..7fe0c160f1 100644 --- 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 83a1119278..26eba78c54 100644 --- 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 020fef29fb..7d6597ea2a 100644 --- 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 b7ef965682..757522ed94 100644 --- 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 fe538ffe89..bdb4228ec1 100644 --- 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 5d27822649..76be2b4c2c 100644 --- 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 f911d4703f..bf13ee7e31 100644 --- 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 865124d3b3..ec61f106ac 100644 --- 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 f8ca6cbae1..6e39921bdb 100644 --- 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 e1b9737c13..402b67283f 100644 --- 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 e4e3977708..0b6b9df567 100644 --- 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 cd72596062..44aa340191 100644 --- 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 15d003326f..61e32659f3 100644 --- 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 1022a8f908..7a0e584d68 100644 --- 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 2388f1f60d..361e0c2893 100644 --- 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 7a878ce647..43a3125651 100644 --- 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 ff03dcd4ef..62847f5570 100644 --- 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 63c3eadbdb..508e7a5a22 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 2b0adb75c0..42addc6a18 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 0c6c8f2152..33cebc824a 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 33b3b05005..f1899a1d0a 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 7d4b63cd72..a3d0858e62 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 3b58bc3bc9..f8710bb33a 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 da2109ff89..6163ccfd38 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 282dffb1de..70c75850a0 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 diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog index a74a3e1a74..9cf6d7f5b8 100644 --- 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 0a1dcb453f..39c13ee26f 100644 --- 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 3605d9c83e..47fffc7df0 100644 --- 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 5612c6eb2e..6c7c57c84a 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 8adb7b48dd..aed4a7d0a0 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 6399d3cc43..1ac29a5883 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 f1af638ee1..c94731af77 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 92ae11e263..50bac0f92e 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 e8dab2ab4b..0815bbd422 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 ae6d217c9f..0f8e1c60c5 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 bde3cb18e2..ef9efb8983 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 ad020ee055..381796717d 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 diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index 0ad336dcc4..99e91114a0 100644 --- 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 d3bbc35f5f..3effe5dd10 100644 --- 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 f770c79000..42e7869ec4 100644 --- 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 fcfa140744..03805ab005 100644 --- 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 d39b4baabe..916e095608 100644 --- 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 |