diff options
author | Danilo Almeida <dalmeida@mit.edu> | 1999-05-17 22:36:25 +0000 |
---|---|---|
committer | Danilo Almeida <dalmeida@mit.edu> | 1999-05-17 22:36:25 +0000 |
commit | 1a296500cfa53385fc6acdd89d4cc6e23af67a5f (patch) | |
tree | 1efb0b9e5da1d64e18e5680f4985601b4ecb546f /src/config/win-post.in | |
parent | 408e8e1705bad975be91fa6dc193ed2f8292436a (diff) | |
download | krb5-1a296500cfa53385fc6acdd89d4cc6e23af67a5f.tar.gz krb5-1a296500cfa53385fc6acdd89d4cc6e23af67a5f.tar.xz krb5-1a296500cfa53385fc6acdd89d4cc6e23af67a5f.zip |
Remove win16 stuff. Add Win9x-compatible output directory creation.
Add more thorough cleanup of output files and directories. Use
latest and greatest (MSVC 6.0) debug flag.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11448 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config/win-post.in')
-rw-r--r-- | src/config/win-post.in | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/src/config/win-post.in b/src/config/win-post.in index 856a9e7a1..5668331f8 100644 --- a/src/config/win-post.in +++ b/src/config/win-post.in @@ -1,4 +1,14 @@ -# config/win-post.in +# +# Start of Win32 post-config lines (config/win-post.in) +# + +!ifndef NO_OUTPRE +outpre-dir:: $(OUTPRE) +!else +outpre-dir:: +!endif + +# # put all:: first just in case no other rules occur here # all:: @@ -17,17 +27,11 @@ DLL_FILE_DEF=/DKRB5_DLL_FILE #(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 + $(BUILDTOP)\$(OUTPRE)wconfig $(BUILDTOP)\config < Makefile.in > Makefile !endif -.c.obj: - $(CC) $(CFLAGS) /c $*.c !if defined(LIBNAME) -!ifndef WIN32 # WIN16 - $(LIBCMD) $(PAGESIZE) /nologo $(LIBNAME) -+$@; - -!else # WIN32 !if !defined(OBJFILELIST) OBJFILELIST=@$(OBJFILE) @@ -40,7 +44,6 @@ all-windows:: $(LIBNAME) $(LIBNAME): $(OBJFILEDEP) $(LIBCMD) /out:$(LIBNAME) /nologo $(OBJFILELIST) -!endif # WIN32 !endif # LIBNAME @@ -51,15 +54,11 @@ clean-windows:: !if defined(LIBOBJS) $(OBJFILE): $(LIBOBJS) $(RM) $(OBJFILE) -!ifndef WIN32 # WIN16 - $(CP) nul: $(OBJFILE) -!else # WIN32 !if defined(PREFIXDIR) $(LIBECHO) -p $(PREFIXDIR)\ $** > $(OBJFILE) !else $(LIBECHO) $** > $(OBJFILE) !endif # !PREFIXDIR -!endif # WIN32 !endif # LIBOBJS !endif # OBJFILE @@ -93,10 +92,6 @@ clean-unix:: if test -n "$(OBJS)" ; then $(RM) $(OBJS); else :; fi $(RM) .depend -clean-windows:: - $(RM) $(OUTPRE)*.$(OBJEXT) - $(RM) $(OUTPRE)msvc.pdb *.err $(OUTPRE)*.exe *.bak - !if defined(LIBNAME) clean-windows:: $(RM) $(LIBNAME) @@ -105,3 +100,14 @@ clean-windows:: clean-windows:: $(RM) $(OBJFILE) !endif + +clean-windows:: clean-windows-files clean-windows-dir + +# This needs to be in the post because we need RM to be defined in terms +# of BUILDTOP +clean-windows-files:: + $(RM) .\$(OUTPRE)*.obj .\$(OUTPRE)*.res + $(RM) .\$(OUTPRE)*.exe .\$(OUTPRE)*.dll + $(RM) .\$(OUTPRE)*.lib .\$(OUTPRE)*.pdb + $(RM) .\$(OUTPRE)*.exp .\$(OUTPRE)*.map + $(RM) .\$(OUTPRE)*.idb .\$(OUTPRE)*.ilk |