These are a bunch of intertwined changes to the windows build.

This log message includes all of the different changes across several
Makefile.in files (and win-pre.in and win-post.in):

- Remove "-" from recursive windows make invocations so that we can bail
  on a build error.  New MIGNORE option restores the previous bailing
  behavior.
- Update windows readme to reflect current practices.
- Add NO_OUTDIR synonym for NO_OUTPRE in windows build.
- Top-level windows Makefile now builds util which now builds
  util/windows, util/et, and util/profile (instead of building them
  directly).
- Remove trailing backslash from rule that creates the windows output dir.
  This backslash would cause the rule to always be invoked.
- Move WCONFIG and WCONFIG_EXE definitions into win-pre.in.
- Remove rules in include directory that blindly copy include header
  files from gssapi, et, and profile.  Instead, use/add build rules to
  the components that generate them that copy only when the file changes.
- Use dependencies in include/krb5 to copy header files instead of blindly
  copying them.  Add !if 0/!endif wrapper to Unix version of the rules.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 399611920b5da769a28df6f7e079a66e83572def..1be4908534d43eaab70d90b19345271ee2920aa6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+               Move definition of WCONFIG into config/win-pre.in.  Use
+               symbolic name for output dir dependency when building
+               wconfig.  Remove wconfig clean stuff since we do it
+               automagically in win-post.in.  Build util instead of
+               directly building util/windows, util/et, util/profile.
+
 Mon May 17 20:45:54 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in, wconfig.c: Rename config/windows.in to 

diff --git a/src/Makefile.in b/src/Makefile.in
index 95aa8642d2eb7947a86b1ff88d386f0b0977ced8..d820e31c7145cabce39e9bcb2fdcf6081138e035 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -18,27 +18,21 @@ all-unix::
 all-mac::
 
 all-windows:: Makefile-windows
-       @echo Making in util\windows
-       cd util\windows
-       -$(MAKE) -$(MAKEFLAGS)
+       @echo Making in util
+       cd util
+       $(MAKE) -$(MFLAGS)
        @echo Making in include
-       cd ..\..\include
-       -$(MAKE) -$(MAKEFLAGS) 
-       @echo Making in util\et
-       cd ..\util\et
-       -$(MAKE) -$(MAKEFLAGS) 
-       @echo Making in util\profile
-       cd ..\profile
-       -$(MAKE) -$(MAKEFLAGS) 
+       cd ..\include
+       $(MAKE) -$(MFLAGS) 
        @echo Making in lib
-       cd ..\..\lib
-       -$(MAKE) -$(MAKEFLAGS) 
+       cd ..\lib
+       $(MAKE) -$(MFLAGS) 
        @echo Making in windows
        cd ..\windows
-       -$(MAKE) -$(MAKEFLAGS) 
+       $(MAKE) -$(MFLAGS) 
        @echo Making in clients
        cd ..\clients
-       -$(MAKE) -$(MAKEFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..
 
 world::
@@ -120,20 +114,19 @@ unixmac:
 #
 
 config-windows:: Makefile-windows
-       @echo Making in include
-       cd include
-       -$(MAKE) -$(MAKEFLAGS)
-       cd ..
+#      @echo Making in include
+#      cd include
+#      $(MAKE) -$(MFLAGS)
+#      cd ..
 
-##DOS##WCONFIG_EXE=.\$(OUTPRE)wconfig.exe
-##DOS##WCONFIG_OBJ=$(OUTPRE)wconfig.obj
-
-##DOS##$(WCONFIG_EXE): $(OUTPRE) wconfig.c
+#
+# We need outpre-dir explicitly in here because we may
+# try to build wconfig on a config-windows.
+#
+##DOS##$(WCONFIG_EXE): outpre-dir wconfig.c
 ##DOS##        $(CC) -Fe$@ -Fo$*.obj wconfig.c
 
-##DOS##MKFDEP= $(WCONFIG_EXE) config\pre.in config\post.in \
-##DOS##        config\win-pre.in config\win-post.in
-##DOS##WCONFIG= $(WCONFIG_EXE) $(WCONFIG_FLAGS)
+##DOS##MKFDEP=$(WCONFIG_EXE) config\win-pre.in config\win-post.in
 
 WINMAKEFILES=Makefile \
        clients\Makefile clients\kdestroy\Makefile \
@@ -161,6 +154,7 @@ WINMAKEFILES=Makefile \
        lib\krb5\keytab\file\Makefile lib\krb5\krb\Makefile \
        lib\krb5\os\Makefile lib\krb5\posix\Makefile \
        lib\krb5\rcache\Makefile \
+       util\Makefile \
        util\et\Makefile util\profile\Makefile \
        util\windows\Makefile \
        windows\Makefile windows\lib\Makefile \
@@ -168,7 +162,6 @@ WINMAKEFILES=Makefile \
        windows\gss\Makefile windows\wintel\Makefile
 
 ##DOS##Makefile-windows:: $(MKFDEP) $(WINMAKEFILES)
-##DOS##        config\rm.bat $(WCONFIG_OBJ)
 
 ##DOS##Makefile: Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
@@ -250,6 +243,8 @@ WINMAKEFILES=Makefile \
 ##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##lib\krb5\rcache\Makefile: lib\krb5\rcache\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
+##DOS##util\Makefile: util\Makefile.in $(MKFDEP)
+##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##util\et\Makefile: util\et\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##util\profile\Makefile: util\profile\Makefile.in $(MKFDEP)
@@ -270,30 +265,23 @@ WINMAKEFILES=Makefile \
 ##DOS##        $(WCONFIG) config < $@.in > $@
 
 clean-windows:: Makefile-windows
-       @echo Making clean in util\windows
-       cd util\windows
-       -$(MAKE) -$(MAKEFLAGS) clean
+       @echo Making clean in util
+       cd util
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in include
-       cd ..\..\include
-       -$(MAKE) -$(MAKEFLAGS) clean
-       @echo Making clean in util\et
-       cd ..\util\et
-       -$(MAKE) -$(MAKEFLAGS) clean
-       @echo Making clean in util\profile
-       cd ..\profile
-       -$(MAKE) -$(MAKEFLAGS) clean
+       cd ..\include
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in lib
-       cd ..\..\lib
-       -$(MAKE) -$(MAKEFLAGS) clean
+       cd ..\lib
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in windows
        cd ..\windows
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in clients
        cd ..\clients
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..
        @echo Making clean in root
-       config\rm.bat $(WCONFIG_OBJ) $(WCONFIG_EXE)
 
 #
 # Renames DOS 8.3 filenames back to their proper, longer names.
@@ -514,17 +502,17 @@ clean-windows-mac:
 KBINDIR=kbin
 
 distclean-windows:
-       rm -f $(CLEANUP)
-       rm -f $(WINMAKEFILES)
-       rm -f $(KBINDIR)\*
+       config\rm.bat $(CLEANUP:^/=^\)
+       config\rm.bat $(WINMAKEFILES)
+       config\rm.bat $(KBINDIR)\*.dll $(KBINDIR)\*.exe
        @if exist $(KBINDIR)\nul rmdir $(KBINDIR)
 
 mkbin:
        @if not exist $(KBINDIR)\nul mkdir $(KBINDIR)
-       -$(CP) lib\$(OUTPRE)*.dll $(KBINDIR)\.
-       -$(CP) windows\cns\$(OUTPRE)krb5.exe $(KBINDIR)\.
-       -$(CP) windows\telnet\$(OUTPRE)telnet.exe $(KBINDIR)\.
-       -$(CP) windows\gss\$(OUTPRE)gss.exe $(KBINDIR)\.
-       -$(CP) clients\klist\$(OUTPRE)klist.exe $(KBINDIR)\.
-       -$(CP) clients\kinit\$(OUTPRE)kinit.exe $(KBINDIR)\.
-       -$(CP) clients\kdestroy\$(OUTPRE)kdestroy.exe $(KBINDIR)\.
+       $(CP) lib\$(OUTPRE)*.dll $(KBINDIR)\.
+       $(CP) windows\cns\$(OUTPRE)krb5.exe $(KBINDIR)\.
+       $(CP) windows\wintel\$(OUTPRE)telnet.exe $(KBINDIR)\.
+       $(CP) windows\gss\$(OUTPRE)gss.exe $(KBINDIR)\.
+       $(CP) clients\klist\$(OUTPRE)klist.exe $(KBINDIR)\.
+       $(CP) clients\kinit\$(OUTPRE)kinit.exe $(KBINDIR)\.
+       $(CP) clients\kdestroy\$(OUTPRE)kdestroy.exe $(KBINDIR)\.

diff --git a/src/clients/ChangeLog b/src/clients/ChangeLog
index 0c92c3824a949b3c8bd7e5d067d8827fa48773ca..7aa79e60a3ee0c2df52eb06ff065c3b71e286719 100644 (file)
--- a/src/clients/ChangeLog
+++ b/src/clients/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 17 12:24:55 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Add NO_OUTPRE flag to prevent creation of output

diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in
index f4307bed05ce5aaa0daabd1659e25e6829fc8fcb..ada6fd0c1f038929faa2e0acbe63ad15703b94a6 100644 (file)
--- a/src/clients/Makefile.in
+++ b/src/clients/Makefile.in
@@ -9,23 +9,23 @@ NO_OUTPRE=1
 all-windows::
        @echo Making all in clients\klist
        cd klist
-       -$(MAKE) -$(MAKEFLAGS)
+       $(MAKE) -$(MFLAGS)
        @echo Making all in clients\kdestroy
        cd ..\kdestroy
-       -$(MAKE) -$(MAKEFLAGS)
+       $(MAKE) -$(MFLAGS)
        @echo Making all in clients\kinit
        cd ..\kinit
-       -$(MAKE) -$(MAKEFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..
 
 clean-windows::
        @echo Making clean in clients\klist
        cd klist
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in clients\kdestroy
        cd ..\kdestroy
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in clients\kinit
        cd ..\kinit
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 9df6575e45659aeb3541e7fff29ee02b26b6fa0f..a696d2895bc1e105ba66ad512c7d05e3a7e420ca 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,12 @@
+Tue May 18 20:06:01 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * win-pre.in, win-pre.in: Remove trailing backslash from output
+               dir target in rule so rule is not always invoked if it
+               already exists.  Add MIGNORE option if we really want make
+               to ignore errors from recursive invocations of make.  Move
+               definition of WCONFIG and WCONFIG_EXE into win-pre.in.
+               Add NO_OUTDIR as synonym for NO_OUTPRE.
+
 Mon May 17 20:45:05 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * win-post.in, win-pre.in, windows.in: Rename windows.in to

diff --git a/src/config/win-post.in b/src/config/win-post.in
index 71c1506e2a356b0de9e6b4053bb3debe98d982ac..99fb81ac882fd06babf47e52b0e53884edb84aa1 100644 (file)
--- a/src/config/win-post.in
+++ b/src/config/win-post.in
@@ -2,10 +2,10 @@
 # Start of Win32 post-config lines (config/win-post.in)
 #
 
-!ifndef NO_OUTPRE
-outpre-dir:: $(OUTPRE)
-!else
+!if defined(NO_OUTPRE) || defined(NO_OUTDIR)
 outpre-dir::
+!else
+outpre-dir:: $(OUTPRE3)
 !endif
 
 #
@@ -27,7 +27,7 @@ DLL_FILE_DEF=/DKRB5_DLL_FILE
 #(where there is already an explicit rule).
 !if !defined(ZIP) && !defined(WINFILES)
 Makefile: Makefile.in $(BUILDTOP)\config\win-pre.in $(BUILDTOP)\config\win-post.in
-       $(BUILDTOP)\$(OUTPRE)wconfig $(BUILDTOP)\config < Makefile.in > Makefile
+       $(WCONFIG) $(BUILDTOP)\config < Makefile.in > Makefile
 !endif
 
 

diff --git a/src/config/win-pre.in b/src/config/win-pre.in
index 25ecb8fc35d4b476333daaf987b6a9ddda071f8b..a41f905abb38cf519146796bd6451aca890b4d9a 100644 (file)
--- a/src/config/win-pre.in
+++ b/src/config/win-pre.in
@@ -50,7 +50,7 @@ OUTPRE2=$(OUTPRE1)\$(CPU)
 OUTPRE3=$(OUTPRE2)\$(OUTPRE_DBG)
 OUTPRE=$(OUTPRE3)^\
 
-$(OUTPRE):
+$(OUTPRE3):
        -@if not exist $(OUTPRE1)\nul mkdir $(OUTPRE1)
        -@if not exist $(OUTPRE2)\nul mkdir $(OUTPRE2)
        -@if not exist $(OUTPRE3)\nul mkdir $(OUTPRE3)
@@ -125,6 +125,9 @@ AWK=rem
 RC = rc
 CVTRES = cvtres
 
+WCONFIG_EXE=$(BUILDTOP)\$(OUTPRE)wconfig.exe
+WCONFIG=$(WCONFIG_EXE:.exe=) $(WCONFIG_FLAGS)
+
 CLIB=$(BUILDTOP)\lib\$(OUTPRE)comerr32.lib
 PLIB=$(BUILDTOP)\lib\$(OUTPRE)xpprof32.lib
 KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_32.lib
@@ -142,6 +145,9 @@ OBJEXT=obj
 EXEEXT=.exe
 
 MFLAGS=$(MAKEFLAGS)
+!ifdef MIGNORE
+MAKE=-$(MAKE)
+!endif
 
 {}.rc{$(OUTPRE)}.res:
        $(RC) $(RCFLAGS) -fo $@ -r $<

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 8fcd8e6c1fb654216b5e731ea1db334f681c2128..2743021051457aa96816ceb67df2e329fca601d9 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,14 @@
+Wed May 19 11:33:15 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove copying of header files for Win32.  These
+               will be copied only if needed by the components that are
+               responsible for the header files (gssapi, et, and
+               profile).
+
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 17 12:30:58 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Add NO_OUTPRE flag to prevent creation of output

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 1f7a5100c4f0a5240323e416dbf9dfd416ec386f..db023fc692cc9c42a32e92063c3686b7a3171c1b 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -10,14 +10,9 @@ all-unix:: krb5.h adm_err.h
 all-mac::
 
 all-windows::
-       copy $(BUILDTOP)\util\et\com_err.h .
-       copy $(BUILDTOP)\util\profile\profile.h .
-       if not exist gssapi\nul mkdir gssapi
-       copy $(BUILDTOP)\lib\gssapi\generic\gssapi.h gssapi
-       copy $(BUILDTOP)\lib\gssapi\generic\gssapi_generic.h gssapi
-       cd krb5
        @echo Making in include\krb5
-       -$(MAKE) -$(MFLAGS)
+       cd krb5
+       $(MAKE) -$(MFLAGS)
        cd ..
 
 krb5/autoconf.h:
@@ -70,7 +65,7 @@ clean-windows::
        if exist gssapi\nul rmdir gssapi
        cd krb5
        @echo Making clean in include\krb5
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..
        @echo Making clean in include
 

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 39f31f7adb46df21e6d389c08b3f4555aaf94ca7..51b4ccbcc7fb2dd910042e813c2aff2ad8a74991 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Wed May 19 11:35:18 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Create build rules for windows instead of blindly
+               copying files.  Wrap Unix build rules with !if 0/!endif
+               that get used only in windows build.  People need to
+               remember to keep this !if/!endif in the proper place when
+               they modify this file.
+
 Mon May 17 12:33:58 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Add NO_OUTPRE flag to prevent creation of output

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index a3ab510a1313bfa380eff7f069f5906e17fb3508..68dec6699373af74549051b7532fd96dd6fedffc 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -17,11 +17,21 @@ BUILT_HEADERS = osconf.h
 
 all-unix:: autoconf.h $(BUILT_HEADERS)
 all-mac:: $(BUILT_HEADERS)
-all-windows::
-       $(RM) osconf.h autoconf.h autoconf.stamp
-       copy stock\osconf.h osconf.h
-       copy ..\win-mac.h autoconf.h
+all-windows:: autoconf.h $(BUILT_HEADERS)
+
+##DOS##autoconf.h: ..\win-mac.h
+##DOS##        $(CP) ..\win-mac.h $@
+##DOS##osconf.h: stock\osconf.h
+##DOS##        $(CP) stock\osconf.h $@
+
+# We need to comment out the Unix autoconf.h and osconf.h block below
+# if we're building for Windows.  Thus, we need to enclose them
+# between the lines "##DOS##!if 0" and "##DOS##!endif".  We enclosed
+# the entire section between the long hashed lines to make the block
+# stand out.
 
+###############################################################################
+##DOS##!if 0
 # Should only rebuild autoconf.h here (use CONFIG_FILES=), but the weird krb5
 # makefile post-processing is unconditional and would trash the makefile.
 autoconf.h: autoconf.stamp
@@ -29,9 +39,6 @@ autoconf.stamp: $(srcdir)/autoconf.h.in $(thisconfigdir)/config.status
        (cd $(thisconfigdir) && $(SHELL) config.status)
        touch autoconf.stamp
 
-depend::
-
-install::
 SYSCONFDIR = @sysconfdir@
 LOCALSTATEDIR = @localstatedir@
 PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
@@ -46,6 +53,12 @@ osconf.h: $(OSCONFSRC)
        cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new
        @if cmp -s osconf.new osconf.h ; then :; \
        else (set -x; $(RM) osconf.h ; $(CP) osconf.new osconf.h; $(RM) osconf.new) fi
+##DOS##!endif
+###############################################################################
+
+depend::
+
+install::
 
 clean::
        $(RM) osconf.new $(BUILT_HEADERS)

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 4bab41370f8989b2cad357d880a0bb13744122f3..a5cdf0b9a1dbafa534361beed76e4bc5ae5ba960 100644 (file)
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 17 19:50:53 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Use only one resource file per binary.

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index f80486579fb6ea61199b872669ccb3941db5568a..a602d821157886348f48a759794a4a300361b646 100644 (file)
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -151,19 +151,19 @@ profile.lib: $(PLIB)
 all-windows:: 
        @echo Making in lib\crypto
        cd crypto
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        @echo Making in lib\krb5
        cd ..\krb5
-       -$(MAKE) -$(MFLAGS) 
+       $(MAKE) -$(MFLAGS) 
        @echo Making in lib\des425
        cd ..\des425
-       -$(MAKE) -$(MFLAGS) 
+       $(MAKE) -$(MFLAGS) 
        @echo Making in lib\krb4
        cd ..\krb4
-       -$(MAKE) -$(MFLAGS) 
+       $(MAKE) -$(MFLAGS) 
        @echo Making in lib\gssapi
        cd ..\gssapi
-       -$(MAKE) -$(MFLAGS) 
+       $(MAKE) -$(MFLAGS) 
        @echo Making in lib
        cd ..
 
@@ -173,18 +173,18 @@ lib-windows:: krb5.lib gssapi.lib krb4.lib
 clean-windows::
        @echo Making clean in lib\crypto
        cd crypto
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in lib\krb5
        cd ..\krb5
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in lib\des425
        cd ..\des425
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in lib\krb4
        cd ..\krb4
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in lib\gssapi
        cd ..\gssapi
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in lib
        cd ..

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 9e5e9c60fa7b7a26ac81728abd8feefba3a9515d..7d4cf47d64055cf3fd6c4ec9cc8a94644de28ffc 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 10 15:15:00 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Do win32 build in subdir.

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 5717655e1794d9765f9b9af0f7060ed1ce6a602d..27956feea47520b9a66c300430667aefdd7aa56e 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -140,108 +140,108 @@ clean::
 all-windows::
        cd crc32
        @echo Making in crypto\crc32
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\des
        @echo Making in crypto\des
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\dk
        @echo Making in crypto\dk
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\enc_provider
        @echo Making in crypto\enc_provider
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\hash_provider
        @echo Making in crypto\hash_provider
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\keyhash_provider
        @echo Making in crypto\keyhash_provider
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\md4
        @echo Making in crypto\md4
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\md5
        @echo Making in crypto\md5
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\old
        @echo Making in crypto\old
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\raw
        @echo Making in crypto\raw
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\sha1
        @echo Making in crypto\sha1
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..
 
 clean-windows::
        cd crc32
        @echo Making in clean crypto\crc32
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\des
        @echo Making clean in crypto\des
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\dk
        @echo Making clean in crypto\dk
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\enc_provider
        @echo Making clean in crypto\enc_provider
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\hash_provider
        @echo Making clean in crypto\hash_provider
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\keyhash_provider
        @echo Making clean in crypto\keyhash_provider
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\md4
        @echo Making clean in crypto\md4
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\md5
        @echo Making clean in crypto\md5
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\old
        @echo Making clean in crypto\old
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\raw
        @echo Making clean in crypto\raw
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\sha1
        @echo Making clean in crypto\sha1
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..
 
 check-windows::
        cd crc32
        @echo Making in check crypto\crc32
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\des
        @echo Making check in crypto\des
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\dk
        @echo Making check in crypto\dk
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\enc_provider
        @echo Making check in crypto\enc_provider
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\hash_provider
        @echo Making check in crypto\hash_provider
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\keyhash_provider
        @echo Making check in crypto\keyhash_provider
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\md4
        @echo Making check in crypto\md4
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\md5
        @echo Making check in crypto\md5
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\old
        @echo Making check in crypto\old
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\raw
        @echo Making check in crypto\raw
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..\sha1
        @echo Making check in crypto\sha1
-       -$(MAKE) -$(MFLAGS) check
+       $(MAKE) -$(MFLAGS) check
        cd ..
 

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 1c0636f9bc2e7bd3f1ae11518727c7c5273d85c5..8f794fa718f13729391bc4317f8ce1497bad06e1 100644 (file)
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 10 15:21:50 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Do win32 build in subdir.

diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 30e6b9d544c224589b5f3299cbf18bea0bccb1a6..992615d5531f424f458a8ef98aec5aaef1982d8c 100644 (file)
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -37,25 +37,25 @@ clean-windows::
 all-windows::
        cd generic
        @echo Making in gssapi\generic
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\krb5
        @echo Making in gssapi\krb5
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
 #      cd ..\mechglue
 #      @echo Making in gssapi\mechglue
-#      -$(MAKE) -$(MFLAGS)
+#      $(MAKE) -$(MFLAGS)
        cd ..
 
 clean-windows::
        cd generic
        @echo Making clean in gssapi\generic
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\krb5
        @echo Making clean in gssapi\krb5
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
 #      cd ..\mechglue
 #      @echo Making clean in gssapi\mechglue
-#      -$(MAKE) -$(MFLAGS) clean
+#      $(MAKE) -$(MFLAGS) clean
        cd ..
        @echo Making clean in gssapi
 

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 08a0e12002113dd18b99c82f62c564f3e7d45970..c5695824648ccb2dc146b4e3d61e60dd61532818 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:39:05 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Fix windows cleanup to ignore any errors while
+               removing gssapi include dir.
+
 Mon May 10 15:22:12 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Do win32 build in subdir.

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 1e21e04fd2809d786927a47a71ca722632a762f6..3b8e8999a154a1d86266b546b95b4d24000bdddb 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -122,7 +122,7 @@ clean-unix:: clean-libobjs
 
 clean-windows::
        $(RM) $(HDRS)
-       if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
+       -if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 includes-unix::
        @if test -d $(EHDRDIR); then :; else (set -x; mkdir $(EHDRDIR)) fi

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index e554d09b5f2ef7dc237d11fef0ad90b345959c54..8e4d75ac5c6fc7ea7a29543f8c7f22421d9fe894 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:40:52 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Add windows build rules for putting header files in
+               include dir.
+
 Mon May 10 15:22:27 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Do win32 build in subdir.

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 0911be555d76c1050ebf5e9821b3b0e779fcf3f1..54990db0bd6a2d5c338e7fe70013c3ff56641a3e 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -170,7 +170,9 @@ EXPORTED_HEADERS= gssapi_krb5.h
 
 ##DOS##LIBOBJS = $(OBJS)
 
-all-windows:: win-include $(SRCS) $(HDRS)
+GSSAPI_KRB5_HDR=$(EHDRDIR)$(S)gssapi_krb5.h
+
+all-windows:: win-include $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS)
 
 all-unix:: $(SRCS) $(HDRS) includes
 all-unix:: all-libobjs
@@ -189,14 +191,16 @@ clean-unix::
 
 win-include::
        if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
-       copy gssapi_krb5.h $(EHDRDIR)
+
+$(GSSAPI_KRB5_HDR): gssapi_krb5.h
+       $(CP) gssapi_krb5.h $@
 
 clean-unix:: clean-libobjs
        $(RM) $(ETHDRS) $(ETSRCS)
 
 clean-windows::
        $(RM) $(EHDRDIR)\gssapi_krb5.h
-       if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
+       -if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 install::
        @set -x; for f in $(EXPORTED_HEADERS) ; \

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 609d060383d9567ded0b62a7dfd3238cf124bdbd..796ef65863463863d6d647e828ec9953271448b2 100644 (file)
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 17 14:09:28 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Make directories for clean-windows target lowercase

diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 92c319c316fad16f91e2193bb5a76630792f0bdd..15fd75d1cb31ddc0186912b0690ba52e16f78e1c 100644 (file)
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -65,55 +65,55 @@ clean-windows::
 all-windows::
        cd asn.1
        @echo Making in krb5\asn.1
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\ccache
        @echo Making in krb5\ccache
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\error_tables
        @echo Making in krb5\error_tables
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\keytab
        @echo Making in krb5\keytab
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\krb
        @echo Making in krb5\krb
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\os
        @echo Making in krb5\os
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\posix
        @echo Making in krb5\posix
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..\rcache
        @echo Making in krb5\rcache
-       -$(MAKE) -$(MFLAGS)
+       $(MAKE) -$(MFLAGS)
        cd ..
 
 clean-windows::
        cd asn.1
        @echo Making clean in krb5\asn.1
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\ccache
        @echo Making clean in krb5\ccache
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\error_tables
        @echo Making clean in krb5\error_tables
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\keytab
        @echo Making clean in krb5\keytab
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\krb
        @echo Making clean in krb5\krb
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\os
        @echo Making clean in krb5\os
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\posix
        @echo Making clean in krb5\posix
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\rcache
        @echo Making clean in krb5\rcache
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..
        @echo Making clean locally
 

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index bb66af42bcf245203b59198afa1ed49780bc7bfc..5080786448bae97b474df7cd4d6450c3442ece07 100644 (file)
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 17 14:11:45 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Clean ccapi subdirectory in clean-windows target.

diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index ddd34dbded2a2704ab55952552574f46a3999594..eafa55773c675dd4765613d8e938584f5a41d609 100644 (file)
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -44,19 +44,19 @@ all-windows:: subdirs $(OBJFILE)
 ##DOS##file\$(OUTPRE)file.lst::
 ##DOS##        cd file
 ##DOS##        @echo Making in krb5\ccache\file
-##DOS##        -$(MAKE) -$(MFLAGS)
+##DOS##        $(MAKE) -$(MFLAGS)
 ##DOS##        cd ..
 
 ##DOS##memory\$(OUTPRE)file.lst::
 ##DOS##        cd memory
 ##DOS##        @echo Making in krb5\ccache\memory
-##DOS##        -$(MAKE) -$(MFLAGS)
+##DOS##        $(MAKE) -$(MFLAGS)
 ##DOS##        cd ..
 
 ##DOS##ccapi\$(OUTPRE)file.lst::
 ##DOS##        cd ccapi
 ##DOS##        @echo Making in krb5\ccache\ccapi
-##DOS##        -$(MAKE) -$(MFLAGS)
+##DOS##        $(MAKE) -$(MFLAGS)
 ##DOS##        cd ..
 
 ##DOS##$(OBJFILE): $(OBJS) file\$(OUTPRE)file.lst memory\$(OUTPRE)file.lst ccapi\$(OUTPRE)file.lst
@@ -71,13 +71,13 @@ clean-unix:: clean-libobjs
 clean-windows::
        cd file
        @echo Making clean in krb5\ccache\file
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\memory
        @echo Making clean in krb5\ccache\memory
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..\ccapi
        @echo Making clean in krb5\ccache\ccapi
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..
        @echo Making clean in krb5\ccache
        $(RM) $(OBJFILE)

diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index eeeac9f94a7da0d6d821c66a3c365fdd82a84809..9e4cf4c74f07dc26d5cb24a73e40b540952c2fd3 100644 (file)
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 10 15:25:32 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Do win32 build in subdir.

diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index d4f98f9b741b74fbb1acf16a9ad6e017a9dfbafa..890e6d5aa39bb666cc7e83ca35fe2cc0998adffb 100644 (file)
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -43,7 +43,7 @@ all-windows:: subdirs $(OBJFILE)
 ##DOSfile\$(OUTPRE)file.lst::
 ##DOS  cd file
 ##DOS  @echo Making in krb5\keytab\file
-##DOS  -$(MAKE) -$(MFLAGS)
+##DOS  $(MAKE) -$(MFLAGS)
 ##DOS  cd ..
 
 ##DOS$(OBJFILE): $(OBJS) file\$(OUTPRE)file.lst
@@ -57,7 +57,7 @@ clean-unix:: clean-libobjs
 clean-windows::
        cd file
        @echo Making clean in krb5\keytab\file
-       -$(MAKE) -$(MFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..
        @echo Making clean in krb5\keytab
        $(RM) $(OBJFILE)

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 61ce7d7ef112884ea556a5f53c4f8275d010fcd3..c72703068ee6f8f146d2b2532d5946af85f03c52 100644 (file)
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:43:36 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Add all and cleanup rules for windows for windows,
+               et, and profile subdirectories.
+
 Sat May 15 19:48:31 1999  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * makeshlib.sh (library): Add -bnoentry to the AIX shared library

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 9777d7972ba837fe4cd855c4e2c7f56cb2c6f93f..b374d7cd493fc1033afdc88b1fb07d97acfa646e 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -14,7 +14,31 @@ SLIBSH=sed -e 's,@''CC''@,$(CC),g' -e 's,@''HOST_TYPE''@,$(HOST_TYPE),g' -e 's,@
 
 all-recurse: libupdate makeshlib
 all-mac::
-all-windows: libupdate
+
+NO_OUTDIR=1
+all-windows::
+       @echo Making in util\windows
+       cd windows
+       $(MAKE) -$(MFLAGS)
+       @echo Making in util\et
+       cd ..\et
+       $(MAKE) -$(MFLAGS) 
+       @echo Making in util\profile
+       cd ..\profile
+       $(MAKE) -$(MFLAGS) 
+       cd ..
+
+clean-windows::
+       @echo Making clean in util\windows
+       cd windows
+       $(MAKE) -$(MFLAGS) clean
+       @echo Making clean in util\et
+       cd ..\et
+       $(MAKE) -$(MFLAGS) clean
+       @echo Making clean in util\profile
+       cd ..\profile
+       $(MAKE) -$(MFLAGS) clean
+       cd ..
 
 # this is necessary because the db2 build, which is intended to be
 # standalone, of course does not know to make symlinks in the right

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 80fcb44cd30b41f14f1ecab6afeb80ae77cecf66..e11c67ce0e12ca263e3620c954f365113c24c7f8 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:44:31 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Add windows build rules for putting header files in
+               include dir.  Do cleanup of header for windows clean.
+
 Mon May 10 15:27:07 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Do win32 build in subdir.

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index ff81a70e277734ecd4431c19ab5bed0f7afd242b..7385943dfbd7a311d107c3910402b9e833aefcc1 100644 (file)
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -61,10 +61,12 @@ SHLIB_LIBS=
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@   
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
+COM_ERR_HDR=$(BUILDTOP)$(S)include$(S)com_err.h
 
-all-windows:: $(OBJFILE)
-       copy com_err.h $(BUILDTOP)\include
+all-windows:: $(COM_ERR_HDR)
 
+$(COM_ERR_HDR): com_err.h
+       $(CP) com_err.h $@
 
 error_table.c: et_lex.lex.c 
 error_table.c: $(srcdir)/error_table.y
@@ -145,7 +147,7 @@ clean-files::
                eddep makedep *.ln
 
 clean-windows::
-       $(RM) $(OUTPRE)comerr.lib comerr.bak
+       $(RM) $(COM_ERR_HDR)
 
 com_err.ps : com_err.dvi
 com_err.dvi: com_err.texinfo

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 31bebbb9a314e78889e10ef590effce0e9a7d99c..e9917c6338504c14ab54dd4fac06c1f858d2347c 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:46:02 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Add windows build rules for putting header files in
+               include dir.  Do cleanup of header for windows clean.
+
 Mon May 10 15:27:19 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Do win32 build in subdir.

diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 1dc5ee026583dbb6162deb7a49f0c9e301b53622..4d15050a3d508fbe6379c30c9c0da6caeb0106e3 100644 (file)
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -51,9 +51,14 @@ SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 STOBJLISTS=OBJS.ST
 
+PROFILE_HDR=$(BUILDTOP)$(S)include$(S)profile.h
+
 all-unix:: includes test_parse test_profile
 all-unix:: all-libs
-all-windows::
+all-windows:: $(PROFILE_HDR)
+
+$(PROFILE_HDR):: profile.h
+       $(CP) profile.h $@
 
 includes:: profile.h
        if cmp profile.h \
@@ -106,7 +111,7 @@ clean-unix:: clean-libs clean-libobjs
                prof_err.c test_profile profile.h
 
 clean-windows::
-       $(RM) $(OUTPRE)profile.lib profile.bak $(OUTPRE)test_parse.exe $(OUTPRE)test_profile.exe
+       $(RM) $(PROFILE_HDR)
 
 check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe
        $(RM) $(OUTPRE)*.obj

diff --git a/src/windows/ChangeLog b/src/windows/ChangeLog
index 30d9bb78ec5e32018a4451b2c484651176786dd6..4a40ba943771527738489e53fd0b74588e307b4f 100644 (file)
--- a/src/windows/ChangeLog
+++ b/src/windows/ChangeLog
@@ -1,3 +1,11 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Remove - from recursive Win32 make invocation.
+
+       * readme: Update with Unix-less build method.  Add notice saying
+               we build with MSVC++ 6.0 and do not know whether it works
+               with other compiler/make utilties.
+
 Mon May 17 19:53:28 1999  Danilo Almeida  <dalmeida@mit.edu>
 
        * version.rc: Boost version to 1.0.6.

diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index 04899ae4e6f211dd88c7a12d8d433e6849b64e80..925a23c957fbec8dc9393322cfee203df3d03875 100644 (file)
--- a/src/windows/Makefile.in
+++ b/src/windows/Makefile.in
@@ -7,35 +7,35 @@ NO_OUTPRE=1
 all-windows::
        @echo Making in windows\lib
        cd lib
-       -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+       $(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
        @echo Making in windows\cns
        cd ..\cns
-       -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+       $(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
        @echo Making in windows\wintel
        cd ..\wintel
-       -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+       $(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
        @echo Making in windows\gss
        cd ..\gss
-       -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+       $(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
        @echo Making in windows\gina
        cd ..\gina
-       -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+       $(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
        cd ..
 
 clean-windows::
        @echo Making clean in windows\lib
        cd lib
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in windows\cns
        cd ..\cns
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in windows\wintel
        cd ..\wintel
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in windows\gss
        cd ..\gss
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        @echo Making clean in windows\gina
        cd ..\gina
-       -$(MAKE) -$(MAKEFLAGS) clean
+       $(MAKE) -$(MFLAGS) clean
        cd ..

diff --git a/src/windows/readme b/src/windows/readme
index df4e5b2238a179c32cde8027f8185149f94342e8..0bcedafe3a6575a44ae1f1f601d410544fefd994 100644 (file)
--- a/src/windows/readme
+++ b/src/windows/readme
@@ -1,11 +1,22 @@
-Windows Kerberos 5
+Building Windows Kerberos 5
 
-Here are the steps for making the Windows version of Kerberos 5.
+We build Kerberos 5 on Windows just with MSVC++ 6.0.  You should
+not need anything else.  We do not know whether it currently
+builds with other compilers or make utilities.
+
+There are two basic methods for making the Windows version of Kerberos
+5.  The traditional method involves starting on a Unix machine and
+creating a distribution that can be built on Windows.  The second
+method works from the sources that come from the CVS tree if you have
+certain Unix-type utilities.
+
+Traditional Method:
+------------------
 
 On the Unix side
 1) cd xxx/src                          # Go to where the source lives
-2) make -f Makefile.in kerbsrc.zip     # Does some Unix-side configuring
-                                       # ...and creates kerbsrc.zip
+2) make -f Makefile.in kerbsrc.zip     # Do some Unix-side configuring
+                                       # ...and create kerbsrc.zip
 3) <transfer kerbsrc.zip to the PC>
 
 
@@ -15,15 +26,20 @@ On the PC side
 3) unzip kerbsrc.zip
         - or -
    pkunzip -d kerbsrc.zip
+4) nmake -nologo                       # Build the sources
+5) nmake mkbin                        # Place binaries generated by the 
+                                       # ...build in the kbin directory
+6) <make sure the configuration file krb5.ini is in the \windows or \winnt 
+    directory.>
 
-4) nmake -c                            # Configures the makefiles and runs
-                                       # ...make in all the subdirectories.
 
-5) mkbin                              # This will run a patch file which
-                                      # collects the DLL's and executables
-                                       # generated by the build procedure
-                                       # and place them in the kbin directory
+All-Windows Method:
+------------------
 
-6) <make sure the configuration file krb5.ini is in the \windows or \winnt 
-    directory.>
+First, make sure you have sed, gawk, cat, and cp.
 
+1) cd xxx/src                          # Go to where the source lives
+2) nmake -f Makefile.in prep-windows   # Create Makefile for Windows
+3) nmake -nologo                       # Build the sources
+4) nmake mkbin                        # Place binaries generated by the 
+                                       # ...build in the kbin directory