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, 87 insertions, 63 deletions

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 626d73c06..46868d38e 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-10  Ken Raeburn  <raeburn@mit.edu>
+
+	* depfix.sed: Change "foo.o" to "$(OUTPRE)foo.$(OBJEXT)" so that
+	generated dependencies will take effect on Windows too.
+
 2001-09-06  Ken Raeburn  <raeburn@mit.edu>
 
 	* depgen.sed: New file.
diff --git a/src/util/depfix.sed b/src/util/depfix.sed
index d8fc7357c..561d08d7c 100644
--- a/src/util/depfix.sed
+++ b/src/util/depfix.sed
@@ -24,6 +24,9 @@ bFIRST
 s/$/ /
 s/  */ /g
 
+# change foo.o -> $(OUTPRE)foo.$(OBJEXT)
+s;^\([a-zA-Z0-9_\-]*\).o:;$(OUTPRE)\1.$(OBJEXT):;
+
 # delete system-specific or compiler-specific files from list
 s;/usr/include/[^ ]* ;;g
 s;/usr/lib/[^ ]* ;;g
diff --git a/src/util/dyn/Makefile.in b/src/util/dyn/Makefile.in
index 228038519..b7781c047 100644
--- a/src/util/dyn/Makefile.in
+++ b/src/util/dyn/Makefile.in
@@ -90,14 +90,21 @@ do-lclint: $(SRCS)
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-dyn_create.o: dyn_create.c dynP.h dyn.h
-dyn_put.o: dyn_put.c dynP.h dyn.h
-dyn_debug.o: dyn_debug.c dynP.h dyn.h
-dyn_delete.o: dyn_delete.c dynP.h dyn.h
-dyn_size.o: dyn_size.c dynP.h dyn.h
-dyn_append.o: dyn_append.c dynP.h dyn.h
-dyn_realloc.o: dyn_realloc.c dynP.h dyn.h
-dyn_paranoid.o: dyn_paranoid.c dynP.h dyn.h
-dyn_insert.o: dyn_insert.c dynP.h dyn.h
-dyn_initzero.o: dyn_initzero.c dynP.h dyn.h
+$(OUTPRE)dyn_create.$(OBJEXT): dyn_create.c dynP.h \
+  dyn.h
+$(OUTPRE)dyn_put.$(OBJEXT): dyn_put.c dynP.h dyn.h
+$(OUTPRE)dyn_debug.$(OBJEXT): dyn_debug.c dynP.h dyn.h
+$(OUTPRE)dyn_delete.$(OBJEXT): dyn_delete.c dynP.h \
+  dyn.h
+$(OUTPRE)dyn_size.$(OBJEXT): dyn_size.c dynP.h dyn.h
+$(OUTPRE)dyn_append.$(OBJEXT): dyn_append.c dynP.h \
+  dyn.h
+$(OUTPRE)dyn_realloc.$(OBJEXT): dyn_realloc.c dynP.h \
+  dyn.h
+$(OUTPRE)dyn_paranoid.$(OBJEXT): dyn_paranoid.c dynP.h \
+  dyn.h
+$(OUTPRE)dyn_insert.$(OBJEXT): dyn_insert.c dynP.h \
+  dyn.h
+$(OUTPRE)dyn_initzero.$(OBJEXT): dyn_initzero.c dynP.h \
+  dyn.h
 
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index c4ef09c7f..c7523d55e 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -226,8 +226,9 @@ depend::  et_lex.lex.c
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-error_message.o: error_message.c com_err.h error_table.h
-et_name.o: et_name.c com_err.h error_table.h
-init_et.o: init_et.c com_err.h error_table.h
-com_err.o: com_err.c com_err.h error_table.h
+$(OUTPRE)error_message.$(OBJEXT): error_message.c com_err.h \
+  error_table.h
+$(OUTPRE)et_name.$(OBJEXT): et_name.c com_err.h error_table.h
+$(OUTPRE)init_et.$(OBJEXT): init_et.c com_err.h error_table.h
+$(OUTPRE)com_err.$(OBJEXT): com_err.c com_err.h error_table.h
 
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 80751e5d1..111c93851 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -119,17 +119,17 @@ check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-prof_tree.o: prof_tree.c prof_int.h $(BUILDTOP)/include/com_err.h \
-  prof_err.h $(BUILDTOP)/include/profile.h
-prof_file.o: prof_file.c prof_int.h $(BUILDTOP)/include/com_err.h \
-  prof_err.h $(BUILDTOP)/include/profile.h
-prof_parse.o: prof_parse.c prof_int.h $(BUILDTOP)/include/com_err.h \
-  prof_err.h $(BUILDTOP)/include/profile.h
-prof_get.o: prof_get.c prof_int.h $(BUILDTOP)/include/com_err.h \
-  prof_err.h $(BUILDTOP)/include/profile.h
-prof_set.o: prof_set.c prof_int.h $(BUILDTOP)/include/com_err.h \
-  prof_err.h $(BUILDTOP)/include/profile.h
-prof_err.o: prof_err.c $(BUILDTOP)/include/com_err.h
-prof_init.o: prof_init.c prof_int.h $(BUILDTOP)/include/com_err.h \
-  prof_err.h $(BUILDTOP)/include/profile.h
+$(OUTPRE)prof_tree.$(OBJEXT): prof_tree.c prof_int.h \
+  $(BUILDTOP)/include/com_err.h prof_err.h $(BUILDTOP)/include/profile.h
+$(OUTPRE)prof_file.$(OBJEXT): prof_file.c prof_int.h \
+  $(BUILDTOP)/include/com_err.h prof_err.h $(BUILDTOP)/include/profile.h
+$(OUTPRE)prof_parse.$(OBJEXT): prof_parse.c prof_int.h \
+  $(BUILDTOP)/include/com_err.h prof_err.h $(BUILDTOP)/include/profile.h
+$(OUTPRE)prof_get.$(OBJEXT): prof_get.c prof_int.h \
+  $(BUILDTOP)/include/com_err.h prof_err.h $(BUILDTOP)/include/profile.h
+$(OUTPRE)prof_set.$(OBJEXT): prof_set.c prof_int.h \
+  $(BUILDTOP)/include/com_err.h prof_err.h $(BUILDTOP)/include/profile.h
+$(OUTPRE)prof_err.$(OBJEXT): prof_err.c $(BUILDTOP)/include/com_err.h
+$(OUTPRE)prof_init.$(OBJEXT): prof_init.c prof_int.h \
+  $(BUILDTOP)/include/com_err.h prof_err.h $(BUILDTOP)/include/profile.h
 
diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index 9326d8ebb..b7babfa23 100644
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -119,30 +119,30 @@ $(BUILDTOP)/include/krb5/autoconf.h: $(SRCTOP)/include/krb5/autoconf.h.in
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-pty_err.o: pty_err.c $(BUILDTOP)/include/com_err.h
-cleanup.o: cleanup.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)pty_err.$(OBJEXT): pty_err.c $(BUILDTOP)/include/com_err.h
+$(OUTPRE)cleanup.$(OBJEXT): cleanup.c $(BUILDTOP)/include/com_err.h \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-getpty.o: getpty.c $(BUILDTOP)/include/com_err.h libpty.h \
-  pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-init_slave.o: init_slave.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)getpty.$(OBJEXT): getpty.c $(BUILDTOP)/include/com_err.h \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-open_ctty.o: open_ctty.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)init_slave.$(OBJEXT): init_slave.c $(BUILDTOP)/include/com_err.h \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-open_slave.o: open_slave.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)open_ctty.$(OBJEXT): open_ctty.c $(BUILDTOP)/include/com_err.h \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-update_utmp.o: update_utmp.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)open_slave.$(OBJEXT): open_slave.c $(BUILDTOP)/include/com_err.h \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-update_wtmp.o: update_wtmp.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)update_utmp.$(OBJEXT): update_utmp.c $(BUILDTOP)/include/com_err.h \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-vhangup.o: vhangup.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)update_wtmp.$(OBJEXT): update_wtmp.c $(BUILDTOP)/include/com_err.h \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-void_assoc.o: void_assoc.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)vhangup.$(OBJEXT): vhangup.c $(BUILDTOP)/include/com_err.h \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-logwtmp.o: logwtmp.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)void_assoc.$(OBJEXT): void_assoc.c $(BUILDTOP)/include/com_err.h \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-init.o: init.c $(BUILDTOP)/include/com_err.h libpty.h \
-  pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
-sane_hostname.o: sane_hostname.c $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)logwtmp.$(OBJEXT): logwtmp.c $(BUILDTOP)/include/com_err.h \
+  libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
+$(OUTPRE)init.$(OBJEXT): init.c $(BUILDTOP)/include/com_err.h \
+  libpty.h pty-int.h pty_err.h $(SRCTOP)/include/syslog.h
+$(OUTPRE)sane_hostname.$(OBJEXT): sane_hostname.c $(BUILDTOP)/include/com_err.h \
   pty-int.h pty_err.h $(SRCTOP)/include/syslog.h libpty.h \
   $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/fake-addrinfo.c $(SRCTOP)/include/fake-addrinfo.h \
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index 6d9a86fbf..9d9abf869 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -170,28 +170,36 @@ clean::
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-invocation.o: invocation.c ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
-  $(BUILDTOP)/include/com_err.h copyright.h
-help.o: help.c ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
-  $(BUILDTOP)/include/com_err.h copyright.h
-execute_cmd.o: execute_cmd.c ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
-  $(BUILDTOP)/include/com_err.h copyright.h
-listen.o: listen.c copyright.h ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
-  $(BUILDTOP)/include/com_err.h
-parse.o: parse.c ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
-  $(BUILDTOP)/include/com_err.h copyright.h
-error.o: error.c copyright.h $(BUILDTOP)/include/com_err.h \
+$(OUTPRE)invocation.$(OBJEXT): invocation.c ss_internal.h \
+  ss.h $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h \
+  copyright.h
+$(OUTPRE)help.$(OBJEXT): help.c ss_internal.h ss.h \
+  $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h \
+  copyright.h
+$(OUTPRE)execute_cmd.$(OBJEXT): execute_cmd.c ss_internal.h \
+  ss.h $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h \
+  copyright.h
+$(OUTPRE)listen.$(OBJEXT): listen.c copyright.h ss_internal.h \
+  ss.h $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h
+$(OUTPRE)parse.$(OBJEXT): parse.c ss_internal.h ss.h \
+  $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h \
+  copyright.h
+$(OUTPRE)error.$(OBJEXT): error.c copyright.h $(BUILDTOP)/include/com_err.h \
   ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h
-prompt.o: prompt.c copyright.h ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
-  $(BUILDTOP)/include/com_err.h
-request_tbl.o: request_tbl.c copyright.h ss_internal.h \
+$(OUTPRE)prompt.$(OBJEXT): prompt.c copyright.h ss_internal.h \
   ss.h $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h
-list_rqs.o: list_rqs.c copyright.h ss_internal.h ss.h \
-  $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h
-pager.o: pager.c ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
-  $(BUILDTOP)/include/com_err.h copyright.h
-requests.o: requests.c ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
+$(OUTPRE)request_tbl.$(OBJEXT): request_tbl.c copyright.h \
+  ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
   $(BUILDTOP)/include/com_err.h
-data.o: data.c ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
-  $(BUILDTOP)/include/com_err.h copyright.h
+$(OUTPRE)list_rqs.$(OBJEXT): list_rqs.c copyright.h \
+  ss_internal.h ss.h $(BUILDTOP)/include/ss/ss_err.h \
+  $(BUILDTOP)/include/com_err.h
+$(OUTPRE)pager.$(OBJEXT): pager.c ss_internal.h ss.h \
+  $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h \
+  copyright.h
+$(OUTPRE)requests.$(OBJEXT): requests.c ss_internal.h \
+  ss.h $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h
+$(OUTPRE)data.$(OBJEXT): data.c ss_internal.h ss.h \
+  $(BUILDTOP)/include/ss/ss_err.h $(BUILDTOP)/include/com_err.h \
+  copyright.h