Rebuild the Makefile in the current directory, as needed

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@9963 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index b8ea301ac412223f462db5ff1dff1168c573578b..5f6947061d1622c3433e870b1e0f6362e6f1b82a 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:42:32 1997  Richard Basch  <basch@lehman.com>
+
+       * win-post.in: Move library list file rule from various
+               Makefile.in files to win-post.in
+
 Mon Feb 17 19:29:27 1997  Richard Basch  <basch@lehman.com>
 
        * windows.in: Define K4LIB as the krb4 library

diff --git a/src/config/win-post.in b/src/config/win-post.in
index 42a4ba0c2b8ff36d35c1bd511176c4a69615947d..a410d36314e8f73326338b7ebfa57d26be53c2d1 100644 (file)
--- a/src/config/win-post.in
+++ b/src/config/win-post.in
@@ -3,6 +3,14 @@
 #
 all::
 
+# Build the Makefile unless we are in the top-level
+#(where there is already an explicit rule).
+!if !defined(ZIP) && !defined(WINFILES)
+Makefile: Makefile.in $(BUILDTOP)\config\windows.in $(BUILDTOP)\config\win-post.in
+       $(BUILDTOP)\wconfig $(BUILDTOP)\config < Makefile.in > Makefile
+!endif
+
+
 .c.obj:
        $(CC) $(CFLAGS) /c $*.c
 !if defined(LIBNAME)
@@ -18,8 +26,25 @@ all::
 ##WIN32##all-windows:: $(LIBNAME)
 ##WIN32##$(LIBNAME): $(OBJFILEDEP)
 ##WIN32##      $(LIBCMD) /out:$(LIBNAME) /nologo $(OBJFILELIST)
+!endif
+
 
+!if defined(OBJFILE)
+all-windows:: $(OBJFILE)
+clean-windows::
+       $(RM) $(OBJFILE)
+!if defined(LIBOBJS)
+##DOS$(OBJFILE): $(LIBOBJS)
+##DOS  $(RM) $(OBJFILE)
+##WIN16##      $(CP) nul: $(OBJFILE)
+!if defined(PREFIXDIR)
+##WIN32##      $(LIBECHO) -p $(PREFIXDIR)\ $** > $(OBJFILE)
+!else
+##WIN32##      $(LIBECHO) $** > $(OBJFILE)
+!endif
 !endif
+!endif
+
 
 check::
 check-windows::
@@ -52,7 +77,7 @@ clean-unix::
 
 clean-windows::
        $(RM) *.$(OBJEXT)
-       $(RM) msvc.pdb *.err *.exe
+       $(RM) msvc.pdb *.err *.exe *.bak
 
 !if defined(LIBNAME)
 clean-windows::

diff --git a/src/config/windows.in b/src/config/windows.in
index cae27f8eb48705f180502f855537e105cc6b8ac5..9ca84c84b6cc2050b951e11d173931b1bcac4603 100644 (file)
--- a/src/config/windows.in
+++ b/src/config/windows.in
@@ -2,11 +2,8 @@
 WHAT=windows
 
 all:: all-$(WHAT)
-
 clean:: clean-$(WHAT)
-
 install:: install-$(WHAT)
-
 check:: check-$(WHAT)
 
 all-windows::
@@ -14,6 +11,7 @@ clean-windows::
 install-windows::
 check-windows::
 
+all-windows:: Makefile
 
 # Directory syntax:
 R=\            # root