Moved some of the library list file build logic from the individual Makefiles

to config/win-post.in

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

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index bf650ad9489828aaa7d48ded9ed0553dc76ae06a..f9d41da8c93a39aa836cbe32630bcd8a45e451ba 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -45,13 +45,7 @@ SHLIB_LIBS=
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
-# FIXME, need to build the library too...
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-liblinks
 install-unix:: install-libs
@@ -60,8 +54,6 @@ libcrypto.lib:
        libdir crypto.lib
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
-clean-windows::
-       $(RM) crypto.lib crypto.bak $(OBJFILE)
 
 check-unix::
 

diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index 2317b415cd550c6226240b5897c0ae2c03cbbb55..c903fdd9e1992319843584c651e5e2378b697a3c 100644 (file)
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 22 18:46:38 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Move list file construction to win-post.in
+
 Thu Jan 30 21:30:32 1997  Richard Basch  <basch@lehman.com>
 
        * crc.c: Declare the functions to take const pointers, where possible.

diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index 7ba33e7ca972e3c61c0ae2245873dab27d5acecd..81bf5d8d51572e69987eff854be9177c445f3890 100644 (file)
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -1,22 +1,15 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=crc32
-##DOSOBJFILE=..\crc32.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=crc32
+##DOS##OBJFILE=..\crc32.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 STLIBOBJS=crc.o
-
 OBJS=  crc.$(OBJEXT)
-
 SRCS=  $(srcdir)/crc.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 
@@ -34,5 +27,3 @@ clean::
        $(RM) crctest$(EXEEXT) crctest.$(OBJEXT)
 
 clean-unix:: clean-libobjs
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 9eef6c1f24af48d3feac30cc50e31fa6f029f1aa..049f004aec72804bbfcee9b4bc6ebf63ba978ecb 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:50:35 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Fri Feb  7 07:12:52 1997  Richard Basch  <basch@lehman.com>
 
        * Makefile.in (all-unix, all-mac): Create shared directory

diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index cac503afc971fa3aeffc48404055d084a6aaa68c..1a5a99f3e54beb235b99f0e88ee08eb6782907f0 100644 (file)
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -1,9 +1,10 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=des
-##DOSOBJFILE=..\des.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=des
+##DOS##OBJFILE=..\des.lst
 ##WIN16##LIBNAME=..\crypto.lib
+
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -82,12 +83,7 @@ SRCS=        $(srcdir)/afsstring2key.c \
        $(srcdir)/u_nfold.c \
        $(srcdir)/u_rn_key.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 
@@ -122,7 +118,4 @@ clean::
        $(RM) destest$(EXEEXT) verify$(EXEEXT) destest.$(OBJEXT) \
        t_verify.$(OBJEXT) t_random.$(OBJEXT) t_random$(EXEEXT)
 
-clean-windows::
-       $(RM) $(OBJFILE)
-
 clean-unix:: clean-libobjs

diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index a82e57b4abee8f519c72b6cdffde4c1f89edefe0..3653c4509d5604af3460734853836c313c27c29d 100644 (file)
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:53:00 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Thu Feb  6 12:46:49 1997  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * Makefile.in (t_cksum): Link with libkrb5.a.

diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index c7ce9c04267ad96a4d0c96240b67700267857cc8..fa92b4ccd229ed8fb23be1e071f478975d60b622 100644 (file)
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -1,25 +1,18 @@
 # -I$(srcdir) is needed to pull in $(srcdir)/rsa-md4.h for ./t_mddriver.c.
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I"$(srcdir)"
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=md4
-##DOSOBJFILE=..\md4.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=md4
+##DOS##OBJFILE=..\md4.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 RUN_SETUP=@KRB5_RUN_ENV@
 
 STLIBOBJS=md4.o md4glue.o md4crypto.o
-
 OBJS=  md4.$(OBJEXT) md4glue.$(OBJEXT) md4crypto.$(OBJEXT)
-
 SRCS=  $(srcdir)/md4.c $(srcdir)/md4glue.c $(srcdir)/md4crypto.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 
@@ -58,5 +51,3 @@ clean::
        $(RM) t_cksum$(EXEEXT) t_cksum.$(OBJEXT) t_cksum.c
 
 clean-unix:: clean-libobjs
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 65f4dc0de312d4a47d9a6bf350f86e0e45442e7a..6cbaa4ab833e1da7c277115fac850d8c75f32b70 100644 (file)
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:54:09 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Thu Feb  6 12:48:41 1997  Ezra Peisach  <epeisach@mit.edu>
 
        * Makefile.in (t_cksum): Link with libkrb5.a as well.

diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index 35104ef9a63e7d641fa30a19616d31cd927f91f0..03cc6ff96d32bed99995e42e246ae44b6a754341 100644 (file)
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=md5
-##DOSOBJFILE=..\md5.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=md5
+##DOS##OBJFILE=..\md5.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 RUN_SETUP = @KRB5_RUN_ENV@
@@ -10,15 +10,9 @@ RUN_SETUP = @KRB5_RUN_ENV@
 STLIBOBJS=md5.o md5glue.o md5crypto.o
 
 OBJS=  md5.$(OBJEXT) md5glue.$(OBJEXT) md5crypto.$(OBJEXT)
-
 SRCS=  $(srcdir)/md5.c $(srcdir)/md5glue.c $(srcdir)/md5crypto.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 
@@ -43,5 +37,3 @@ clean::
        $(RM) t_cksum$(EXEEXT) t_cksum.$(OBJEXT)
 
 clean-unix:: clean-libobjs
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
index 26dc9d41635040980a615db54e6d8c54d076bf8e..3690df66fb10910f7a4682204a699144f1a767b0 100644 (file)
--- a/src/lib/crypto/os/ChangeLog
+++ b/src/lib/crypto/os/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:54:53 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Mon Feb 17 17:24:41 1997  Richard Basch  <basch@lehman.com>
 
        * c_ustime.c: Fixed microsecond adjustment code (win32)

diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 97790f04808938509cccf826e25d7118dec65da4..eed5aedba87f8b0a7d60e71435039ae8210e8609 100644 (file)
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=os
-##DOSOBJFILE=..\os.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=os
+##DOS##OBJFILE=..\os.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 STLIBOBJS = rnd_confoun.o c_localaddr.o c_ustime.o @LIBOBJS@
@@ -12,12 +12,7 @@ OBJS= $(COBJS) $(LIBOBJS)
 
 SRCS=  rnd_confoun.c c_localaddr.c c_ustime.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(COBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(COBJS)
 
 all-unix:: all-libobjs
 
@@ -29,6 +24,3 @@ memmove.o: memmove.c
 clean-unix:: clean-libobjs
 clean:: 
        $(RM) memmove.c
-
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/crypto/sha/ChangeLog b/src/lib/crypto/sha/ChangeLog
index 1d0aa949e75ee61a4aebc7718635b1b95e35f8da..03521a5b7863932490bbc06dc7828b20a4f2fb02 100644 (file)
--- a/src/lib/crypto/sha/ChangeLog
+++ b/src/lib/crypto/sha/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:52:09 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Thu Jan 30 21:31:39 1997  Richard Basch  <basch@lehman.com>
 
        * sha_crypto.c sha_glue.c:

diff --git a/src/lib/crypto/sha/Makefile.in b/src/lib/crypto/sha/Makefile.in
index a64757f577f014ebe389a0263b267a4c70224f0a..20f2ac906d40ffbbae8768c2514bba7eccbfef57 100644 (file)
--- a/src/lib/crypto/sha/Makefile.in
+++ b/src/lib/crypto/sha/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYDIR=sha
-##DOSOBJFILE=..\sha.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=sha
+##DOS##OBJFILE=..\sha.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 STLIBOBJS=shs.o hmac_sha.o sha_crypto.o sha_glue.o
@@ -18,12 +18,8 @@ SRCS=        $(srcdir)/shs.c         \
        $(srcdir)/sha_glue.c
 
 
-all-windows:: $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYDIR)\ *.obj > $(OBJFILE)
 
 all-unix:: all-libobjs
 
@@ -43,5 +39,3 @@ clean::
        $(RM) t_shs$(EXEEXT) t_shs.$(OBJEXT)
 
 clean-unix:: clean-libobjs
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index c10aa1075c86c86316855c6ae315ffe2cad19659..c8635e7360c29cf36e0f14075a39033906a07eaa 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:55:52 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Sat Feb 22 01:07:34 1997  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * read_passwd.c: Don't base definitions on unix being defined.

diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 5e8c4ec73a1c38b8c37c638e3cebb55a2f0dc5fb..18d144d4a8bbc29a87040a72142802fc19b6cd48 100644 (file)
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -1,10 +1,10 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV
 
-##DOSBUILDTOP = ..\..
-##DOSLIBNAME=des425.lib
-##DOSOBJFILE=des425.lst
-##DOSOBJFILEDEP=des425.lst
-##DOSOBJFILELIST=@des425.lst
+##DOS##BUILDTOP = ..\..
+##DOS##LIBNAME=des425.lib
+##DOS##OBJFILE=des425.lst
+##DOS##OBJFILEDEP=des425.lst
+##DOS##OBJFILELIST=@des425.lst
 
 RUN_SETUP=@KRB5_RUN_ENV@
 
@@ -76,12 +76,8 @@ DEPKLIB= $(TOPLIBD)/libcrypto.a
 
 all-unix:: all-liblinks
 all-mac:: $(OBJS)
-all-windows:: $(OBJFILE)
 
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 shared:
        mkdir shared
@@ -100,9 +96,6 @@ clean::
        $(RM) verify$(EXEEXT) verify.$(OBJEXT)
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
-clean-mac::
-clean-windows::
-       $(RM) des425.lib des425.bak $(OBJFILE)
 
 libdes425.$(STEXT): $(OBJS)
        $(RM) $@

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 7d26c1c8c900090e31ff13bb2e77f7a28524bfe4..043ccadb3736de67965cf210b5398b32161d7b8a 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:57:56 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Sun Feb  9 11:41:08 1997  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Fix includes generation for unix after

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 276417c77f34d692cf35711820c1fa01d5ed2173..49d6c3b9d7eb571a860d607ca50b544e252b82b8 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,12 +1,10 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=generic
-##DOSOBJFILE=..\generic.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=generic
+##DOS##OBJFILE=..\generic.lst
 ##WIN16##LIBNAME=..\gssapi.lib
 
-all-windows:: $(OBJS)
-
 ETSRCS= gssapi_err_generic.c
 ETOBJS= gssapi_err_generic.$(OBJEXT)
 ETHDRS= gssapi_err_generic.h
@@ -103,12 +101,10 @@ all-unix:: includes-unix
 all-unix:: $(EXPORTED_HEADERS) $(ETHDRS) $(HDRS)
 all-unix:: all-libobjs
 
-all-windows:: win-include $(HDRS) $(OBJFILE)
 
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
+
+all-windows:: win-include $(HDRS)
 
 win-include::
        if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
@@ -119,7 +115,7 @@ clean-unix:: clean-libobjs
        $(RM) $(ETHDRS) $(ETSRCS) $(HDRS)
 
 clean-windows::
-       $(RM) $(HDRS) $(OBJFILE)
+       $(RM) $(HDRS)
        if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 includes-unix::

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 54bfce28cc1e1885288d681b4b53484b43ebbad2..b8d8e366b03bbfb4ffe580b90ee890a852b2d9d8 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:59:42 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Wed Feb  5 20:27:50 1997  Richard Basch  <basch@lehman.com>
 
        * util_crypt.c: Include k5-int.h as we need to dereference

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 579edd14458dd29e3a72cc2128769d24d07aa5e6..bfcdfbedbad13c38e500faf019d61e0b59312957 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=krb5
-##DOSOBJFILE = ..\krb5.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=krb5
+##DOS##OBJFILE = ..\krb5.lst
 ##WIN16##LIBNAME=..\gssapi.lib
 
 ETSRCS= gssapi_err_krb5.c
@@ -138,12 +138,9 @@ HDRS= $(ETHDRS)
 EHDRDIR=$(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS= gssapi_krb5.h
 
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj >$(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
-all-windows:: win-include $(SRCS) $(HDRS) $(OBJS) $(OBJFILE)
+all-windows:: win-include $(SRCS) $(HDRS)
 
 all-unix:: $(SRCS) $(HDRS) includes
 all-unix:: all-libobjs
@@ -156,7 +153,7 @@ clean-unix:: clean-libobjs
        $(RM) $(ETHDRS) $(ETSRCS)
 
 clean-windows::
-       $(RM) $(EHDRDIR)\gssapi_krb5.h $(OBJFILE)
+       $(RM) $(EHDRDIR)\gssapi_krb5.h
        if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 install::

diff --git a/src/lib/kadm/Makefile.in b/src/lib/kadm/Makefile.in
index f76a58abc47eb758274a3e27e123ebe57f1e1ea9..06fcb28d8253faf419188b1ca3cb8cb47ca6d7c7 100644 (file)
--- a/src/lib/kadm/Makefile.in
+++ b/src/lib/kadm/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS) 
 
-##DOSBUILDTOP = ..\..
-##DOSLIBNAME=kadm.lib
-##DOSOBJFILE=kadm.lst
+##DOS##BUILDTOP = ..\..
+##DOS##LIBNAME=kadm.lib
+##DOS##OBJFILE=kadm.lst
 
 RUN_SETUP=@KRB5_RUN_ENV@
 BASE_OBJS= adm_conn.$(OBJEXT)  \
@@ -40,12 +40,8 @@ SRCS=        $(srcdir)/adm_conn.c    \
 all-unix:: $(BASE_OBJS) $(DB_OBJS) $(UNIX_OBJS)
 all-unix:: libkadm.a
 all-mac:: $(BASE_OBJS) $(DB_OBJS)
-all-windows:: $(OBJFILE)
 
-##DOS$(OBJFILE): $(BASE_OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(BASE_OBJS)
 
 libkadm.a: $(OBJS) $(UNIX_OBJS)
        $(RM) $@
@@ -60,8 +56,6 @@ clean-unix::
        $(RM) libkadm.$(LIBEXT) $(UNIX_OBJS)
 clean-mac::
        $(RM) libkadm.$(LIBEXT)
-clean-windows::
-       $(RM) kadm.lib kadm.bak $(OBJFILE)
 
 #
 # t_dbentry

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index c15769ddba26e54417792cbdbf55547781ef4f29..d00a26da84e17cd4838726d835812bca4a5f49f3 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 19:02:08 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Sat Feb 22 01:16:01 1997  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * Makefile.in (SHLIB_DIRS): Remove extra shlib_explibs

diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index c6df6f11317732c9baee1da46b404958e2a18491..4985e08956594a3b6e5df4dccfe191a04c60b3b9 100644 (file)
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -185,13 +185,8 @@ DBG=$(DBG_LIB)
 
 
 all-unix:: krb_err.h includes all-liblinks
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) *.obj > $(OBJFILE)
 
+##DOS##LIBOBJS = $(OBJS)
 
 # comp_et_depend(krb_err)
 krb_err.h:: krb_err.et

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 266e982aeafb476abb9b89a5f0d46ca179d71093..54a0ca7ca6908bac1d5ebbaecf3ba79b0cb68772 100644 (file)
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:13:35 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: win32 build

diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index 07cba37cb67796a5c0ed9dfe4ad10837a3da05c7..babb6b926d22cb9aab8325eb22b3591f91524e29 100644 (file)
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS=$(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYDIR=asn.1
-##DOSOBJFILE=..\asn1.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=asn.1
+##DOS##OBJFILE=..\asn1.lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
@@ -43,15 +43,8 @@ OBJS= \
        asn1_k_encode.$(OBJEXT)\
        asn1_misc.$(OBJEXT)
 
-all-windows:: $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYDIR)\ *.obj > $(OBJFILE)
 all-unix:: all-libobjs
 
 clean-unix:: clean-libobjs
-
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 6482ba4c2c331998bb2f9b982995264a6594d370..2a628803b3959fd382077d810dd97c7146c133a2 100644 (file)
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=ccache
-##DOSOBJFILE=..\$(MYNAME).lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=ccache
+##DOS##OBJFILE=..\$(PREFIXDIR).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 MAC_SUBDIRS = file stdio
@@ -37,7 +37,7 @@ all-windows:: subdirs $(OBJFILE)
 ##DOS$(OBJFILE): $(OBJS) file\file.lst
 ##DOS  $(RM) $(OBJFILE)
 ##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE)
+##WIN32##      $(LIBECHO) -p $(PREFIXDIR)\ *.obj file\*.obj > $(OBJFILE)
 
 clean-unix:: clean-libobjs
 

diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 247cab2dcb49b82bfd555890ffaabbcaec14d96b..af136d90c59165c4ded2efdc9c0262b227778e10 100644 (file)
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:25:09 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: win32 build

diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index 8f6547910461a7e44064f7c6b9314c10a8f12488..3def8f1ec6d7604ed3295c33a9e629f36eab25a8 100644 (file)
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..\..
-##DOSMYNAME = ccache\file
-##DOSOBJFILE = file.lst
+##DOS##BUILDTOP = ..\..\..\..
+##DOS##PREFIXDIR = ccache\file
+##DOS##OBJFILE = file.lst
 ##WIN16##LIBNAME=..\..\krb5.lib
 
 STLIBOBJS = \
@@ -30,17 +30,7 @@ SRCS         = $(srcdir)/fcc_close.c $(srcdir)/fcc_destry.c $(srcdir)/fcc_eseq.c \
        $(srcdir)/fcc_write.c $(srcdir)/fcc_sflags.c $(srcdir)/fcc_defops.c \
        $(srcdir)/fcc_errs.c $(srcdir)/fcc_maybe.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
-all-windows:: $(OBJS)
-
 clean-unix:: clean-libobjs
-
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index 328a237fe6561943ce38751e32cd83f83e7d6fb5..7287b62934fda0bc51203fe5b6fdb09afbf0f9b7 100644 (file)
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:26:16 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Sat Feb 15 15:41:58 1997  Richard Basch  <basch@lehman.com>
 
        * init_ets.c (krb5_finish_ets):

diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 7316b45e12482e473aea3d00862d6394ca79ff3c..c17991fa98a018b510833f6816f5cae6588a78e4 100644 (file)
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=error_tables
-##DOSOBJFILE=..\err_tbls.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=error_tables
+##DOS##OBJFILE=..\err_tbls.lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5
@@ -29,12 +29,7 @@ ETSRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c
 SRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c \
        $(srcdir)/init_ets.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 all-libobjs: $(HDRS)
@@ -70,4 +65,3 @@ kv5m_err.$(OBJEXT): kv5m_err.c
 
 clean-unix:: clean-libobjs
        $(RM) $(HDRS) $(ETSRCS)
-clean-windows::

diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog
index a1a4486a22c3f7d8e9c611bcfc489314807a7f2b..ec0dcb41c8cbde9a1c0e070a897e70daa80f2f38 100644 (file)
--- a/src/lib/krb5/free/ChangeLog
+++ b/src/lib/krb5/free/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:26:56 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Wed Feb 19 22:45:29 1997  Richard Basch  <basch@lehman.com>
 
        * Makefile.in f_unparse.c:

diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index 4e6a99afb856bbce533ca5e86b00c85ef741af2b..4cffc53beed8d69acd89eaa73bce305e66b61a2f 100644 (file)
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=free
-##DOSOBJFILE=..\$(MYNAME).lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=free
+##DOS##OBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 STLIBOBJS= \
@@ -113,16 +113,7 @@ SRCS=      \
        $(srcdir)/f_pwd_seq.c   \
        $(srcdir)/f_unparse.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
-
 clean-unix:: clean-libobjs
-
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 2b339b31219a3a22fbcce800c8b6ea448e9d5079..336394e88da3619e584ac7e7456dc431338c995a 100644 (file)
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=keytab
-##DOSOBJFILE=..\$(MYNAME).lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=keytab
+##DOS##OBJFILE=..\$(PREFIXDIR).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 MAC_SUBDIRS = file
@@ -43,10 +43,9 @@ all-windows:: subdirs $(OBJFILE)
 ##DOS$(OBJFILE): $(OBJS) file\file.lst
 ##DOS  $(RM) $(OBJFILE)
 ##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE)
+##WIN32##      $(LIBECHO) -p $(PREFIXDIR)\ *.obj file\*.obj > $(OBJFILE)
 
 all-unix:: all-libobjs
-
 clean-unix:: clean-libobjs
 
 clean-windows::

diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index ddd45c509d2da534a535e1d8bf754b60fabbe5f0..9d3f524eae3eb9716d343da10dd2e811f12290d6 100644 (file)
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:27:53 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: win32 build

diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index d24712cdd94179bbe34232dc0aa157e338e37902..a4362ba42c2e2564fc1beb9c76f99705da946b3c 100644 (file)
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..\..
-##DOSMYNAME=keytab\file
-##DOSOBJFILE= file.lst
+##DOS##BUILDTOP = ..\..\..\..
+##DOS##PREFIXDIR=keytab\file
+##DOS##OBJFILE= file.lst
 ##WIN16##LIBNAME=..\..\krb5.lib
 
 STLIBOBJS = \
@@ -56,15 +56,7 @@ OBJS = \
        ktf_defops.$(OBJEXT)    \
        ser_ktf.$(OBJEXT)
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
-
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 479eff89e58c95c0df731333441a0cb7552257cd..85bd7473afb9a6ab7d76df784cea80be1a2f0f74 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:39:49 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Fri Feb 21 18:38:06 1997  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * crypto_glue.c: Move into libcrypto as krb5_glue.c; I need to

diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 434fad6f1cf008c9dd62edc04ec89e846b4dceba..d28aa586d7f5dcdf562964a9e7c5e18c2e1e7964 100644 (file)
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -3,9 +3,9 @@ RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=krb
-##DOSOBJFILE=..\$(MYNAME).lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=krb
+##DOS##OBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 STLIBOBJS= \
@@ -232,14 +232,10 @@ SRCS=     $(srcdir)/addr_comp.c   \
        $(srcdir)/valid_times.c \
        $(srcdir)/walk_rtree.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
+clean-unix:: clean-libobjs
 
 COMERRLIB=$(TOPLIBD)/libcom_err.a
 
@@ -291,13 +287,7 @@ check-unix:: $(TEST_PROGS)
        KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\
                $(RUN_SETUP) ./t_ser
 
-check-windows::
-
 clean::
        $(RM) t_walk_rtree$(EXEEXT) t_walk_rtree.$(OBJEXT)
        $(RM) t_kerb$(EXEEXT) t_kerb.$(OBJEXT)
        $(RM) t_ser$(EXEEXT) t_ser.$(OBJEXT)
-
-clean-unix:: clean-libobjs
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 6f85b3ee77d260bb191a6e5ae586ad5aef957fee..9861fbf55f7d0a9a12f066b1dbbeeb04088b00cb 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:41:02 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Fri Feb 21 20:06:55 1997  Ezra Peisach  <epeisach@mit.edu>
 
        * def_realm.c: Remove extern declaration of un-used krb5_config_file.

diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 7f0ea13cf18ab42b5bd426c59d9b520150eb4279..c75b86adae12b3c6ee9dd694c81482aca4ee7688 100644 (file)
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -3,10 +3,9 @@ KRB5_RUN_ENV = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-##DOSBUILDTOP = ..\..\..
-##DOSDBFLAGS=
-##DOSMYNAME=os
-##DOSOBJFILE=..\$(MYNAME).lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=os
+##DOS##OBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 STLIBOBJS= \
@@ -129,14 +128,10 @@ SRCS= \
        $(srcdir)/ustime.c      \
        $(srcdir)/write_msg.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
+clean-unix:: clean-libobjs
 
 shared:
        mkdir shared
@@ -193,7 +188,3 @@ check-unix::
 
 clean:: 
        $(RM) $(TEST_PROGS) test.out t_std_conf.o t_an_to_ln.o
-
-clean-unix:: clean-libobjs
-clean-windows::
-       $(RM) $(OBJFILE)

diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index 4086a892eee18d55a5e58319ba33ee9891dac939..b5954ce926a2e5286944289e256ba960f67792a2 100644 (file)
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:42:10 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Tue Feb  4 15:54:11 1997  Richard Basch  <basch@lehman.com>
 
        * Makefile.in: Only build sscanf for Win16

diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index d783372872bc979f55bfaac8d1654dcd83a028e5..77fdf273d027060439c06178beb1618ce04f746f 100644 (file)
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=posix
-##DOSOBJFILE=..\$(MYNAME).lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=posix
+##DOS##OBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 STLIBOBJS=setenv.o @LIBOBJS@
@@ -10,18 +10,8 @@ MACSRCS = getuid.c strcasecmp.c strdup.c
 
 OBJS = setenv.$(OBJEXT)        @LIBOBJS@
 
-all-windows:: $(OBJFILE)
 all-unix:: all-libobjs
-
-##WIN16##$(OBJFILE): syslog.obj sscanf.obj
-##WIN16##      $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-
 clean-unix:: clean-libobjs
 
-##WIN32##$(OBJFILE): syslog.obj
-##WIN32##      $(RM) $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
-
-clean-windows::
-       $(RM) $(OBJFILE)
+##WIN16##LIBOBJS = syslog.obj sscanf.obj
+##WIN32##LIBOBJS = syslog.obj

diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 40926903546b7a1639d6c715e1e50ffe7802e73d..1ebc2cffaa6b6cc2f9d4d92155aba8f17ef7a0b3 100644 (file)
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:44:15 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Use some of the new library list build rules in
+               win-post.in
+
 Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: win32 build

diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index 470e1a045155c1788fcd05564ca68e019ea639b3..94c3af7ec36d6b7de8ab3ee7bfa5dc817697bf73 100644 (file)
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=rcache
-##DOSOBJFILE=..\$(MYNAME).lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=rcache
+##DOS##OBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 STLIBOBJS = \
@@ -29,16 +29,7 @@ SRCS=        \
        $(srcdir)/rc_conv.c     \
        $(srcdir)/ser_rc.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
-
-clean-windows::
-       $(RM) $(OBJFILE)
-
 clean-unix:: clean-libobjs

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 74d96d934fa72f0328202c2cc2f71b57723607ae..085a63af3f00ee7cb27dc5ad723d25d216c67188 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,5 +1,7 @@
 Sat Feb 22 12:18:47 1997  Richard Basch  <basch@lehman.com>
 
+       * Makefile.in: Move list file construction to win-post.in
+
        * et_c.awk et_h.awk error_message.c com_err.c:
                Put back #ifdef unix, and also based it on AIX.
                We do NOT want the compatibility interface on any new

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index d04796816104c60e0514597c798a010f39774024..261d4008c273c3db478e96564603243300df3053 100644 (file)
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -58,11 +58,6 @@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 all-windows:: $(OBJFILE)
        copy com_err.h $(BUILDTOP)\include
 
-##DOS$(OBJFILE): $(LIBOBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) *.obj > $(OBJFILE)
-
 
 error_table.c: et_lex.lex.c 
 error_table.c: $(srcdir)/error_table.y

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 298b4cec609d8c2eab7a29deb88e7e47d848a926..834a44949b9e693ff64190569e2e2089a02fc557 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 22 18:33:17 1997  Richard Basch  <basch@lehman.com>
+
+       * Makefile.in: Move list file construction to win-post.in
+
 Tue Feb 18 00:14:13 1997  Richard Basch  <basch@lehman.com>
 
        * profile.hin prof_int.h prof_init.c:

diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index edc0fe79c53d382ba348107c7e7a1c0f197a6334..36b07245c09795df5517dbf3d19d166c4107281c 100644 (file)
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -35,13 +35,9 @@ STOBJLISTS=OBJS.ST
 
 all-unix:: includes test_parse test_profile
 all-unix:: all-libs
+all-windows::
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS  $(RM) $(OBJFILE)
-##WIN16##      $(CP) nul: $(OBJFILE)
-##WIN32##      $(LIBECHO) *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 
 awk-windows: