Update automatic dependencies to work on Windows by using $(OUTPRE) and

$(OBJEXT).  Change a couple of UNIX rules to not trigger incorrectly on
Windows.  Rebuild dependencies.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13801 dc483132-0cff-0310-8789-dd5450dbe970

7 files changed, 173 insertions, 159 deletions

diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index e6eefd374..92b4dc872 100644
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -100,47 +100,51 @@ kcmd.o krcp.o krlogin.o krlogind.o krsh.o krshd.o forward.o: defines.h
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-krcp.o: krcp.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/k5-util.h \
+$(OUTPRE)krcp.$(OBJEXT): krcp.c $(BUILDTOP)/include/krb5.h \
+  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
+  $(SRCTOP)/include/k5-util.h $(SRCTOP)/include/kerberosIV/krb.h \
+  $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \
+  defines.h
+$(OUTPRE)krlogin.$(OBJEXT): krlogin.c $(BUILDTOP)/include/krb5.h \
+  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
+  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
+  $(SRCTOP)/include/port-sockets.h defines.h rpaths.h
+$(OUTPRE)krsh.$(OBJEXT): krsh.c $(BUILDTOP)/include/krb5.h \
+  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
   $(SRCTOP)/include/port-sockets.h defines.h
-krlogin.o: krlogin.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/kerberosIV/krb.h \
-  $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \
-  defines.h rpaths.h
-krsh.o: krsh.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/kerberosIV/krb.h \
-  $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \
+$(OUTPRE)kcmd.$(OBJEXT): kcmd.c $(BUILDTOP)/include/krb5.h \
+  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
+  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
+  $(SRCTOP)/include/port-sockets.h defines.h
+$(OUTPRE)forward.$(OBJEXT): forward.c $(SRCTOP)/include/k5-int.h \
+  $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
+  defines.h
+$(OUTPRE)login.$(OBJEXT): login.c $(BUILDTOP)/include/libpty.h \
+  $(SRCTOP)/include/syslog.h $(SRCTOP)/include/k5-int.h \
+  $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
+  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
+  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb524.h \
+  $(BUILDTOP)/include/krb524_err.h loginpaths.h
+$(OUTPRE)krshd.$(OBJEXT): krshd.c $(BUILDTOP)/include/libpty.h \
+  $(SRCTOP)/include/syslog.h $(BUILDTOP)/include/krb5.h \
+  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
+  loginpaths.h $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
+  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/k5-util.h \
   defines.h
-kcmd.o: kcmd.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
+$(OUTPRE)krlogind.$(OBJEXT): krlogind.c $(SRCTOP)/include/syslog.h \
+  $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
   $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \
+  $(BUILDTOP)/include/libpty.h $(SRCTOP)/include/k5-util.h \
   defines.h
-forward.o: forward.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
+$(OUTPRE)v4rcp.$(OBJEXT): v4rcp.c $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h defines.h
-login.o: login.c $(BUILDTOP)/include/libpty.h $(SRCTOP)/include/syslog.h \
-  $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
-  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/krb.h \
-  $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb524.h $(BUILDTOP)/include/krb524_err.h \
-  loginpaths.h
-krshd.o: krshd.c $(BUILDTOP)/include/libpty.h $(SRCTOP)/include/syslog.h \
-  $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h loginpaths.h $(SRCTOP)/include/kerberosIV/krb.h \
+  $(SRCTOP)/include/k5-util.h $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \
-  $(SRCTOP)/include/k5-util.h defines.h
-krlogind.o: krlogind.c $(SRCTOP)/include/syslog.h $(BUILDTOP)/include/krb5.h \
-  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/libpty.h \
-  $(SRCTOP)/include/k5-util.h defines.h
-v4rcp.o: v4rcp.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/k5-util.h \
-  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
-  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/krbports.h \
-  rpaths.h
+  $(SRCTOP)/include/kerberosIV/krbports.h rpaths.h
 
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index d592bab67..debb00760 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -37,10 +37,10 @@ install-unix::
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-gss-client.o: gss-client.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \
+$(OUTPRE)gss-client.$(OBJEXT): gss-client.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h gss-misc.h
-gss-misc.o: gss-misc.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \
+$(OUTPRE)gss-misc.$(OBJEXT): gss-misc.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h gss-misc.h
-gss-server.o: gss-server.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \
+$(OUTPRE)gss-server.$(OBJEXT): gss-server.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \
   $(BUILDTOP)/include/gssapi/gssapi.h gss-misc.h
 
diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index febe8c1f0..cc5de00a2 100644
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -74,23 +74,25 @@ secure.o: $(srcdir)/secure.c
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-cmds.o: cmds.c $(SRCTOP)/include/port-sockets.h $(srcdir)/../arpa/ftp.h \
-  ftp_var.h pathnames.h
-cmdtab.o: cmdtab.c ftp_var.h
-domacro.o: domacro.c ftp_var.h
-ftp.o: ftp.c $(srcdir)/../arpa/ftp.h $(srcdir)/../arpa/telnet.h \
+$(OUTPRE)cmds.$(OBJEXT): cmds.c $(SRCTOP)/include/port-sockets.h \
+  $(srcdir)/../arpa/ftp.h ftp_var.h pathnames.h
+$(OUTPRE)cmdtab.$(OBJEXT): cmdtab.c ftp_var.h
+$(OUTPRE)domacro.$(OBJEXT): domacro.c ftp_var.h
+$(OUTPRE)ftp.$(OBJEXT): ftp.c $(srcdir)/../arpa/ftp.h \
+  $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/port-sockets.h \
+  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
+  $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \
+  $(BUILDTOP)/include/gssapi/gssapi_krb5.h $(BUILDTOP)/include/krb5.h \
+  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
+  ftp_var.h secure.h
+$(OUTPRE)getpass.$(OBJEXT): getpass.c ftp_var.h
+$(OUTPRE)glob.$(OBJEXT): glob.c ftp_var.h
+$(OUTPRE)main.$(OBJEXT): main.c ftp_var.h $(srcdir)/../arpa/ftp.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/krb.h \
-  $(SRCTOP)/include/kerberosIV/des.h $(BUILDTOP)/include/gssapi/gssapi.h \
-  $(BUILDTOP)/include/gssapi/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi_krb5.h \
-  $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h ftp_var.h secure.h
-getpass.o: getpass.c ftp_var.h
-glob.o: glob.c ftp_var.h
-main.o: main.c ftp_var.h $(srcdir)/../arpa/ftp.h $(SRCTOP)/include/port-sockets.h \
-  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h
-radix.o: radix.c ftp_var.h
-ruserpass.o: ruserpass.c ftp_var.h
-secure.o: secure.c $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(SRCTOP)/include/kerberosIV/des.h
+$(OUTPRE)radix.$(OBJEXT): radix.c ftp_var.h
+$(OUTPRE)ruserpass.$(OBJEXT): ruserpass.c ftp_var.h
+$(OUTPRE)secure.$(OBJEXT): secure.c $(BUILDTOP)/include/gssapi/gssapi.h \
   $(BUILDTOP)/include/gssapi/gssapi_generic.h secure.h \
   $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
   $(SRCTOP)/include/port-sockets.h $(srcdir)/../arpa/ftp.h
diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index 5d7863530..d6027f89f 100644
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -79,27 +79,30 @@ vers.o: $(srcdir)/vers.c
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-ftpd.o: ftpd.c $(srcdir)/../arpa/ftp.h $(srcdir)/../arpa/telnet.h \
-  $(SRCTOP)/include/syslog.h pathnames.h $(BUILDTOP)/include/libpty.h \
-  $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/krb5.h \
-  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb524.h \
-  $(BUILDTOP)/include/krb524_err.h $(BUILDTOP)/include/gssapi/gssapi.h \
-  $(BUILDTOP)/include/gssapi/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi_krb5.h \
-  ftpd_var.h secure.h
-ftpcmd.o: ftpcmd.c $(srcdir)/../arpa/ftp.h $(SRCTOP)/include/syslog.h \
-  ftpd_var.h $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \
-  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
-  $(SRCTOP)/include/port-sockets.h $(srcdir)/../arpa/telnet.h
-popen.o: popen.c ftpd_var.h $(BUILDTOP)/include/gssapi/gssapi.h \
+$(OUTPRE)ftpd.$(OBJEXT): ftpd.c $(srcdir)/../arpa/ftp.h \
+  $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/syslog.h \
+  pathnames.h $(BUILDTOP)/include/libpty.h $(SRCTOP)/include/k5-util.h \
+  $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/kerberosIV/krb.h \
+  $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \
+  $(BUILDTOP)/include/krb524.h $(BUILDTOP)/include/krb524_err.h \
+  $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \
+  $(BUILDTOP)/include/gssapi/gssapi_krb5.h ftpd_var.h \
+  secure.h
+$(OUTPRE)ftpcmd.$(OBJEXT): ftpcmd.c $(srcdir)/../arpa/ftp.h \
+  $(SRCTOP)/include/syslog.h ftpd_var.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(BUILDTOP)/include/gssapi/gssapi_generic.h $(SRCTOP)/include/kerberosIV/krb.h \
+  $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \
+  $(srcdir)/../arpa/telnet.h
+$(OUTPRE)popen.$(OBJEXT): popen.c ftpd_var.h $(BUILDTOP)/include/gssapi/gssapi.h \
   $(BUILDTOP)/include/gssapi/gssapi_generic.h
-vers.o: vers.c
-glob.o: $(srcdir)/../ftp/glob.c $(srcdir)/../ftp/ftp_var.h
-radix.o: $(srcdir)/../ftp/radix.c $(srcdir)/../ftp/ftp_var.h
-secure.o: $(srcdir)/../ftp/secure.c $(BUILDTOP)/include/gssapi/gssapi.h \
-  $(BUILDTOP)/include/gssapi/gssapi_generic.h secure.h \
-  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
+$(OUTPRE)vers.$(OBJEXT): vers.c
+$(OUTPRE)glob.$(OBJEXT): $(srcdir)/../ftp/glob.c $(srcdir)/../ftp/ftp_var.h
+$(OUTPRE)radix.$(OBJEXT): $(srcdir)/../ftp/radix.c \
+  $(srcdir)/../ftp/ftp_var.h
+$(OUTPRE)secure.$(OBJEXT): $(srcdir)/../ftp/secure.c \
+  $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \
+  secure.h $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
   $(SRCTOP)/include/port-sockets.h $(srcdir)/../arpa/ftp.h
-getdtablesize.o: $(srcdir)/../../bsd/getdtablesize.c
+$(OUTPRE)getdtablesize.$(OBJEXT): $(srcdir)/../../bsd/getdtablesize.c
 
diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in
index cdfb8dccc..0e8efb157 100644
--- a/src/appl/telnet/libtelnet/Makefile.in
+++ b/src/appl/telnet/libtelnet/Makefile.in
@@ -90,40 +90,42 @@ install::
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-auth.o: auth.c $(srcdir)/../arpa/telnet.h encrypt.h \
-  enc-proto.h auth.h auth-proto.h misc-proto.h
-encrypt.o: encrypt.c $(srcdir)/../arpa/telnet.h encrypt.h \
-  enc-proto.h misc.h misc-proto.h
-genget.o: genget.c misc.h misc-proto.h
-misc.o: misc.c misc.h misc-proto.h auth.h auth-proto.h \
-  encrypt.h enc-proto.h
-kerberos.o: kerberos.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(srcdir)/../arpa/telnet.h \
-  $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/kerberosIV/krb.h \
-  $(SRCTOP)/include/port-sockets.h encrypt.h enc-proto.h \
-  auth.h auth-proto.h misc.h misc-proto.h
-kerberos5.o: kerberos5.c $(srcdir)/../arpa/telnet.h \
+$(OUTPRE)auth.$(OBJEXT): auth.c $(srcdir)/../arpa/telnet.h \
+  encrypt.h enc-proto.h auth.h auth-proto.h misc-proto.h
+$(OUTPRE)encrypt.$(OBJEXT): encrypt.c $(srcdir)/../arpa/telnet.h \
+  encrypt.h enc-proto.h misc.h misc-proto.h
+$(OUTPRE)genget.$(OBJEXT): genget.c misc.h misc-proto.h
+$(OUTPRE)misc.$(OBJEXT): misc.c misc.h misc-proto.h \
+  auth.h auth-proto.h encrypt.h enc-proto.h
+$(OUTPRE)kerberos.$(OBJEXT): kerberos.c $(BUILDTOP)/include/krb5.h \
+  $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
+  $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/kerberosIV/des.h \
+  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/port-sockets.h \
+  encrypt.h enc-proto.h auth.h auth-proto.h misc.h misc-proto.h
+$(OUTPRE)kerberos5.$(OBJEXT): kerberos5.c $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/syslog.h \
   encrypt.h enc-proto.h auth.h auth-proto.h misc.h misc-proto.h \
   krb5forw.h
-forward.o: forward.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h \
+$(OUTPRE)forward.$(OBJEXT): forward.c $(SRCTOP)/include/k5-int.h \
+  $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
+  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/krb5/kdb.h \
+  krb5forw.h
+$(OUTPRE)spx.$(OBJEXT): spx.c misc-proto.h
+$(OUTPRE)enc_des.$(OBJEXT): enc_des.c $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/com_err.h \
-  $(SRCTOP)/include/krb5/kdb.h krb5forw.h
-spx.o: spx.c misc-proto.h
-enc_des.o: enc_des.c $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(BUILDTOP)/include/com_err.h $(srcdir)/../arpa/telnet.h \
-  encrypt.h enc-proto.h key-proto.h misc-proto.h
-setenv.o: setenv.c misc-proto.h
-getent.o: getent.c gettytab.h
-parsetos.o: parsetos.c misc-proto.h
-strdup.o: strdup.c
-strcasecmp.o: strcasecmp.c
-strchr.o: strchr.c
-strrchr.o: strrchr.c
-strftime.o: strftime.c
-strerror.o: strerror.c
+  $(srcdir)/../arpa/telnet.h encrypt.h enc-proto.h key-proto.h \
+  misc-proto.h
+$(OUTPRE)setenv.$(OBJEXT): setenv.c misc-proto.h
+$(OUTPRE)getent.$(OBJEXT): getent.c gettytab.h
+$(OUTPRE)parsetos.$(OBJEXT): parsetos.c misc-proto.h
+$(OUTPRE)strdup.$(OBJEXT): strdup.c
+$(OUTPRE)strcasecmp.$(OBJEXT): strcasecmp.c
+$(OUTPRE)strchr.$(OBJEXT): strchr.c
+$(OUTPRE)strrchr.$(OBJEXT): strrchr.c
+$(OUTPRE)strftime.$(OBJEXT): strftime.c
+$(OUTPRE)strerror.$(OBJEXT): strerror.c
 
diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 5f73a2eb6..c9766b5b6 100644
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -75,33 +75,34 @@ utilities.o: defines.h externs.h fdset.h general.h ring.h $(ARPA_TELNET)
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-authenc.o: authenc.c $(srcdir)/../arpa/telnet.h $(srcdir)/../libtelnet/encrypt.h \
-  $(srcdir)/../libtelnet/enc-proto.h $(srcdir)/../libtelnet/misc.h \
-  $(srcdir)/../libtelnet/misc-proto.h general.h ring.h \
-  externs.h defines.h types.h
-commands.o: commands.c $(srcdir)/../arpa/telnet.h general.h \
-  ring.h externs.h defines.h types.h $(srcdir)/../libtelnet/auth.h \
+$(OUTPRE)authenc.$(OBJEXT): authenc.c $(srcdir)/../arpa/telnet.h \
+  $(srcdir)/../libtelnet/encrypt.h $(srcdir)/../libtelnet/enc-proto.h \
+  $(srcdir)/../libtelnet/misc.h $(srcdir)/../libtelnet/misc-proto.h \
+  general.h ring.h externs.h defines.h types.h
+$(OUTPRE)commands.$(OBJEXT): commands.c $(srcdir)/../arpa/telnet.h \
+  general.h ring.h externs.h defines.h types.h $(srcdir)/../libtelnet/auth.h \
   $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
   $(srcdir)/../libtelnet/enc-proto.h $(srcdir)/../libtelnet/misc-proto.h \
   $(SRCTOP)/include/fake-addrinfo.c $(SRCTOP)/include/fake-addrinfo.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
   $(BUILDTOP)/include/krb5/autoconf.h
-main.o: main.c $(srcdir)/../libtelnet/auth.h $(srcdir)/../libtelnet/auth-proto.h \
-  $(srcdir)/../libtelnet/encrypt.h $(srcdir)/../libtelnet/enc-proto.h \
-  ring.h externs.h defines.h
-network.o: network.c $(srcdir)/../arpa/telnet.h ring.h \
-  defines.h externs.h fdset.h
-ring.o: ring.c ring.h general.h
-sys_bsd.o: sys_bsd.c $(srcdir)/../arpa/telnet.h ring.h \
-  fdset.h defines.h externs.h types.h
-telnet.o: telnet.c $(srcdir)/../arpa/telnet.h ring.h \
-  defines.h externs.h types.h general.h $(srcdir)/../libtelnet/auth.h \
+$(OUTPRE)main.$(OBJEXT): main.c $(srcdir)/../libtelnet/auth.h \
+  $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
+  $(srcdir)/../libtelnet/enc-proto.h ring.h externs.h \
+  defines.h
+$(OUTPRE)network.$(OBJEXT): network.c $(srcdir)/../arpa/telnet.h \
+  ring.h defines.h externs.h fdset.h
+$(OUTPRE)ring.$(OBJEXT): ring.c ring.h general.h
+$(OUTPRE)sys_bsd.$(OBJEXT): sys_bsd.c $(srcdir)/../arpa/telnet.h \
+  ring.h fdset.h defines.h externs.h types.h
+$(OUTPRE)telnet.$(OBJEXT): telnet.c $(srcdir)/../arpa/telnet.h \
+  ring.h defines.h externs.h types.h general.h $(srcdir)/../libtelnet/auth.h \
   $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
   $(srcdir)/../libtelnet/enc-proto.h $(srcdir)/../libtelnet/misc-proto.h
-terminal.o: terminal.c $(srcdir)/../arpa/telnet.h ring.h \
-  externs.h types.h $(srcdir)/../libtelnet/encrypt.h \
+$(OUTPRE)terminal.$(OBJEXT): terminal.c $(srcdir)/../arpa/telnet.h \
+  ring.h externs.h types.h $(srcdir)/../libtelnet/encrypt.h \
   $(srcdir)/../libtelnet/enc-proto.h
-utilities.o: utilities.c $(srcdir)/../arpa/telnet.h \
+$(OUTPRE)utilities.$(OBJEXT): utilities.c $(srcdir)/../arpa/telnet.h \
   general.h fdset.h ring.h defines.h externs.h $(srcdir)/../libtelnet/auth.h \
   $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
   $(srcdir)/../libtelnet/enc-proto.h
diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index 389dffa58..818636b6c 100644
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -85,45 +85,47 @@ utility.o: telnetd.h defs.h ext.h $(ARPA_TELNET)
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-telnetd.o: telnetd.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
-  $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/syslog.h ext.h pathnames.h $(BUILDTOP)/include/libpty.h \
-  $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/fake-addrinfo.c \
-  $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
-  $(srcdir)/../libtelnet/auth.h $(srcdir)/../libtelnet/auth-proto.h \
-  $(srcdir)/../libtelnet/encrypt.h $(srcdir)/../libtelnet/enc-proto.h \
-  $(srcdir)/../libtelnet/misc-proto.h
-termio-tn.o: termio-tn.c
-termios-tn.o: termios-tn.c
-state.o: state.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
-  $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/syslog.h ext.h $(srcdir)/../libtelnet/auth.h \
+$(OUTPRE)telnetd.$(OBJEXT): telnetd.c telnetd.h defs.h \
+  $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \
+  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/syslog.h \
+  ext.h pathnames.h $(BUILDTOP)/include/libpty.h $(BUILDTOP)/include/com_err.h \
+  $(SRCTOP)/include/fake-addrinfo.c $(SRCTOP)/include/fake-addrinfo.h \
+  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5.h \
+  $(BUILDTOP)/include/profile.h $(srcdir)/../libtelnet/auth.h \
   $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
-  $(srcdir)/../libtelnet/enc-proto.h
-termstat.o: termstat.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
-  $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/syslog.h ext.h
-slc.o: slc.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
+  $(srcdir)/../libtelnet/enc-proto.h $(srcdir)/../libtelnet/misc-proto.h
+$(OUTPRE)termio-tn.$(OBJEXT): termio-tn.c
+$(OUTPRE)termios-tn.$(OBJEXT): termios-tn.c
+$(OUTPRE)state.$(OBJEXT): state.c telnetd.h defs.h \
+  $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \
+  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/syslog.h \
+  ext.h $(srcdir)/../libtelnet/auth.h $(srcdir)/../libtelnet/auth-proto.h \
+  $(srcdir)/../libtelnet/encrypt.h $(srcdir)/../libtelnet/enc-proto.h
+$(OUTPRE)termstat.$(OBJEXT): termstat.c telnetd.h defs.h \
+  $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \
+  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/syslog.h \
+  ext.h
+$(OUTPRE)slc.$(OBJEXT): slc.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/syslog.h ext.h
-sys_term.o: sys_term.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
-  $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/syslog.h ext.h pathnames.h $(BUILDTOP)/include/com_err.h \
-  $(BUILDTOP)/include/libpty.h $(srcdir)/../libtelnet/auth.h \
-  $(srcdir)/../libtelnet/auth-proto.h $(SRCTOP)/include/k5-int.h \
-  $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5.h \
-  $(BUILDTOP)/include/profile.h $(SRCTOP)/include/krb5/kdb.h
-utility.o: utility.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
-  $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/syslog.h ext.h $(srcdir)/../libtelnet/auth.h \
-  $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \
-  $(srcdir)/../libtelnet/enc-proto.h
-global.o: global.c defs.h $(srcdir)/../arpa/telnet.h \
+$(OUTPRE)sys_term.$(OBJEXT): sys_term.c telnetd.h defs.h \
+  $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \
+  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/syslog.h \
+  ext.h pathnames.h $(BUILDTOP)/include/com_err.h $(BUILDTOP)/include/libpty.h \
+  $(srcdir)/../libtelnet/auth.h $(srcdir)/../libtelnet/auth-proto.h \
+  $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
+  $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \
+  $(SRCTOP)/include/krb5/kdb.h
+$(OUTPRE)utility.$(OBJEXT): utility.c telnetd.h defs.h \
+  $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \
+  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/syslog.h \
+  ext.h $(srcdir)/../libtelnet/auth.h $(srcdir)/../libtelnet/auth-proto.h \
+  $(srcdir)/../libtelnet/encrypt.h $(srcdir)/../libtelnet/enc-proto.h
+$(OUTPRE)global.$(OBJEXT): global.c defs.h $(srcdir)/../arpa/telnet.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/syslog.h ext.h
-authenc.o: authenc.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \
-  $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/syslog.h ext.h $(srcdir)/../libtelnet/misc.h \
-  $(srcdir)/../libtelnet/misc-proto.h
+$(OUTPRE)authenc.$(OBJEXT): authenc.c telnetd.h defs.h \
+  $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \
+  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/syslog.h \
+  ext.h $(srcdir)/../libtelnet/misc.h $(srcdir)/../libtelnet/misc-proto.h