From 5579fec8bba6dbeee1290d131e4fc915ec46dd51 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 24 Feb 2004 19:24:25 +0000 Subject: 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 --- src/kadmin/server/ChangeLog | 5 +++++ src/kadmin/server/Makefile.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/kadmin') diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index f5f29f644..272e53328 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,8 @@ +2004-02-24 Ken Raeburn + + * Makefile.in (OBJS, $(PROG)): Link against apputils lib instead + of using LIBOBJS. + 2003-09-02 Alexandra Ellwood * ovsec_kadmd.c: Added Apple password server support. diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in index 21e6aab6c..17406e77a 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) -- cgit