diff options
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/ChangeLog | 9 | ||||
| -rw-r--r-- | src/config/win-post.in | 8 | ||||
| -rw-r--r-- | src/config/win-pre.in | 8 |
3 files changed, 20 insertions, 5 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 9df6575e4..a696d2895 100644 --- 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 71c1506e2..99fb81ac8 100644 --- 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 25ecb8fc3..a41f905ab 100644 --- 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 $< |