pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / lib / apputils / Makefile.in

diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in
index 9393f56bf23272757ed9195e0ce4b6f88e511c99..75dd613dc00cadccca6851b015dcdee08399f51d 100644 (file)
--- a/src/lib/apputils/Makefile.in
+++ b/src/lib/apputils/Makefile.in
@@ -2,9 +2,7 @@ prefix=@prefix@
 bindir=@bindir@
 datadir=@datadir@
 mydatadir=$(datadir)/apputils
-thisconfigdir=.
-myfulldir=lib/apputils
-mydir=.
+mydir=lib$(S)apputils
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../lib/apputils
 SED = sed
@@ -15,9 +13,7 @@ DEFS=
 ##DOS##XTRA=
 ##DOS##OBJFILE=$(OUTPRE)apputils.lst
 
-# LIBOBJS may or may not contain daemon.o; dummy.o is just here to
-# avoid having an empty library.
-STLIBOBJS=dummy.o @LIBOBJS@
+STLIBOBJS=net-server.o @LIBOBJS@
 STOBJLISTS=OBJS.ST
 LIBBASE=apputils
 
@@ -30,22 +26,9 @@ LINTFILES= daemon.c
 LIBOBJS=$(OUTPRE)daemon.$(OBJEXT)
 
 SRCS=  $(srcdir)/daemon.c \
-       $(srcdir)/dummy.c
+       $(srcdir)/net-server.c
 
-# @lib_frag@
-# @libobj_frag@
+@libpriv_frag@
+@lib_frag@
+@libobj_frag@
 
-# +++ Dependency line eater +++
-# 
-# Makefile dependencies follow.  This must be the last section in
-# the Makefile.in file
-#
-daemon.so daemon.po $(OUTPRE)daemon.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-err.h \
-  $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
-  $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
-  $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
-  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  daemon.c
-dummy.so dummy.po $(OUTPRE)dummy.$(OBJEXT): dummy.c