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/kadmin/server | |
| parent | 74b6af2609c5235a650bb15f9e8aecb998fbbd2a (diff) | |
| download | krb5-5579fec8bba6dbeee1290d131e4fc915ec46dd51.tar.gz krb5-5579fec8bba6dbeee1290d131e4fc915ec46dd51.tar.xz krb5-5579fec8bba6dbeee1290d131e4fc915ec46dd51.zip | |
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/kadmin/server')
| -rw-r--r-- | src/kadmin/server/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/server/Makefile.in | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index f5f29f644a..272e533280 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,8 @@ +2004-02-24 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (OBJS, $(PROG)): Link against apputils lib instead + of using LIBOBJS. + 2003-09-02 Alexandra Ellwood <lxs@mit.edu> * ovsec_kadmd.c: Added Apple password server support. diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in index 21e6aab6cb..17406e77a2 100644 --- a/src/kadmin/server/Makefile.in +++ b/src/kadmin/server/Makefile.in @@ -10,12 +10,12 @@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) PROG = kadmind -OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o server_glue_v1.o @LIBOBJS@ +OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o server_glue_v1.o all:: $(PROG) -$(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) - $(CC_LINK) -o $(PROG) $(OBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) +$(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(APPUTILS_DEPLIB) + $(CC_LINK) -o $(PROG) $(OBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) install:: $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(SERVER_BINDIR)/$(PROG) |