diff options
author | Ken Raeburn <raeburn@mit.edu> | 2004-02-24 19:24:25 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2004-02-24 19:24:25 +0000 |
commit | 5579fec8bba6dbeee1290d131e4fc915ec46dd51 (patch) | |
tree | a96b7b7f92cf3e3e84d3451819ed3547cb5d2c4a /src/kdc | |
parent | 74b6af2609c5235a650bb15f9e8aecb998fbbd2a (diff) | |
download | krb5-5579fec8bba6dbeee1290d131e4fc915ec46dd51.zip krb5-5579fec8bba6dbeee1290d131e4fc915ec46dd51.tar.gz krb5-5579fec8bba6dbeee1290d131e4fc915ec46dd51.tar.bz2 |
Move daemon.c into a new library of utility routines for linking our programs
against but which we don't want to install as a separate library.
Change Kerberos and application servers to link against the library if they
might need the replacement daemon() function.
Add a dummy file to the library in case daemon() is not needed, so we don't
have an empty library, which we may not handle properly.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16118 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc')
-rw-r--r-- | src/kdc/ChangeLog | 5 | ||||
-rw-r--r-- | src/kdc/Makefile.in | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 0732bf9..ccc42d6 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,8 @@ +2004-02-24 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (OBJS, krb5kdc, fakeka): Link against apputils lib + instead of using LIBOBJ. + 2004-02-19 Ken Hornstein <kenh@mit.edu> * fakeka.c (main): Bug from David Thompson <thomas@cs.wisc.edu>. diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index efbc928..d3079f6 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -46,8 +46,7 @@ OBJS= \ policy.o \ extern.o \ replay.o \ - kerberos_v4.o \ - @LIBOBJS@ + kerberos_v4.o RT_OBJS= rtest.o \ kdc_util.o \ @@ -68,14 +67,14 @@ kdc5_err.h: kdc5_err.et kdc5_err.o: kdc5_err.h -krb5kdc: $(OBJS) $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS) - $(CC_LINK) -o krb5kdc $(OBJS) $(KADMSRV_LIBS) $(KRB4COMPAT_LIBS) +krb5kdc: $(OBJS) $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS) $(APPUTILS_DEPLIB) + $(CC_LINK) -o krb5kdc $(OBJS) $(KADMSRV_LIBS) $(KRB4COMPAT_LIBS) $(APPUTILS_LIB) rtest: $(RT_OBJS) $(KDB5_DEPLIBS) $(KADM_COMM_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o rtest $(RT_OBJS) $(KDB5_LIBS) $(KADM_COMM_LIBS) $(KRB5_BASE_LIBS) -fakeka: fakeka.o $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS) @LIBOBJS@ - $(CC_LINK) -o fakeka fakeka.o $(KADMSRV_LIBS) $(KRB4COMPAT_LIBS) @LIBOBJS@ +fakeka: fakeka.o $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS) $(APPUTILS_DEPLIB) + $(CC_LINK) -o fakeka fakeka.o $(KADMSRV_LIBS) $(KRB4COMPAT_LIBS) $(APPUTILS_LIB) check-unix:: rtest KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;\ |