diff options
| author | Richard Basch <probe@mit.edu> | 1997-02-23 07:27:59 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1997-02-23 07:27:59 +0000 |
| commit | 06f89c3aeaf734c5df82d3ee98f4e2fe9b05f6e1 (patch) | |
| tree | 59695e7e38129d01088d347ac98a9f4f90185672 /src | |
| parent | 571a1375f7d2f1df52bd29c711c804314e0432d3 (diff) | |
| download | krb5-06f89c3aeaf734c5df82d3ee98f4e2fe9b05f6e1.tar.gz krb5-06f89c3aeaf734c5df82d3ee98f4e2fe9b05f6e1.tar.xz krb5-06f89c3aeaf734c5df82d3ee98f4e2fe9b05f6e1.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/ChangeLog | 5 | ||||
| -rw-r--r-- | src/config/win-post.in | 27 | ||||
| -rw-r--r-- | src/config/windows.in | 4 |
3 files changed, 32 insertions, 4 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index b8ea301ac..5f6947061 100644 --- 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 42a4ba0c2..a410d3631 100644 --- 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 cae27f8eb..9ca84c84b 100644 --- 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 |