patch-from-shadow-to-jaltman-bkbox-20031120

[openafs.git] / src / config / NTMakefile.i386_nt40

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index c1862b6..d22d3cb 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -69,11 +69,11 @@ OBJ=obj
 !IF ("$(AFS_OBJDIR)"=="") 
 #########  AFS_OBJDIR is NOT used use default locations
 !  IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(OBJ)\$(DEST)\checked
-OJT=$(MAKEDIR:src=obj\checked)
+DESTDIR=$(AFSROOT)\$(DEST)\checked
+OJT=$(AFSROOT)\$(OBJ)\checked
 !  ELSE
-DESTDIR=$(AFSROOT)\$(OBJ)\$(DEST)\free
-OJT=$(MAKEDIR:src=obj\free)
+DESTDIR=$(AFSROOT)\$(DEST)\free
+OJT=$(AFSROOT)\$(OBJ)\free
 !  ENDIF
 UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !ELSE
@@ -118,14 +118,23 @@ UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !  ENDIF
 !ENDIF #AFS_OBJDIR
 
-!MESSAGE Directory assignments: OJT=[$(OJT)] DESTDIR=[$(DESTDIR)]
+!IF ("$(RELDIR)"=="")
+OUT=$(OJT)
+!ELSE
+OUT=$(OJT)\$(RELDIR)
+!ENDIF
+
+!MESSAGE Directory assignments: 
+!MESSAGE     OJT=[$(OJT)]
+!MESSAGE     OUT=[$(OUT)] 
+!MESSAGE DESTDIR=[$(DESTDIR)]
 
 # Definitions provided here are based on WIN32.MAK, a common nmake
 # file included with the MS SDK and MS VC distributions.
 # WIN32.MAK, and this nmake file, are targeted to the MSVC compiler;
 # port this nmake file if additional compiler support is required.
 
-!IF ("$(AFSVER)"=="1300")
+!IF ("$(AFSVER_CL)"=="1300")
 afslflags = $(afslflags) /DEBUG
 !ENDIF
 
@@ -133,7 +142,7 @@ afslflags = $(afslflags) /DEBUG
 APPVER=4.0
 !ENDIF
 
-!UNDEF NODEBUG
+
 
 !INCLUDE <WIN32.MAK>
 
@@ -155,8 +164,8 @@ MIDL  = midl
 
 # Common clean target.
 clean::
-       $(DEL) /q $(OJT)\*.obj $(OJT)\*.lib $(OJT)\*.dll $(OJT)\*.exe $(OJT)\*.pdb
-       $(DEL) /q $(OJT)\*_component_version_number.* *_component_version_number.*
+       $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb
+       $(DEL) /q $(OUT)\*_component_version_number.* *_component_version_number.*
 
 # Common lang target.
 lang::
@@ -208,6 +217,7 @@ cdebug = $(cdebug) -Zi
 afscflags = $(afscflags) /Ox
 cdebug = $(cdebug:-Od=) # avoid annoying override warning (D4025)
 cvarsdll = $(cvarsdll:-MDd=-MD)
+NODEBUG=1
 
 !ELSE          # CHECKED BUILD
 
@@ -219,6 +229,7 @@ afscdefs = $(afscdefs) -DDEBUG
 afscflags = $(afscflags) -D_DEBUG -D_CRTDBG_MAP_ALLOC
 !ENDIF
 
+!UNDEF NODEBUG
 !ENDIF
 
 # Set compiler warning level
@@ -241,21 +252,21 @@ afscflags = $(afscflags) /W$(AFSDEV_WARNLEVEL)
 C2OBJ   = $(cc) /Fo$@ /Fd$*.pdb $(cflags) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c  
 CPP2OBJ = $(C2OBJ)
 # Inference rules for building and installing targets
-# Compile .c files, from current directory to defined by OJT
+# Compile .c files, from current directory to defined by OUT
 
 .SUFFIXES: .c .rc 
 
-.c{$(OJT)\}.obj:
+.c{$(OUT)\}.obj:
        $(C2OBJ) $<
    
 .c.obj:
    $(C2OBJ) $<
 
-.cpp{$(OJT)\}.obj:
+.cpp{$(OUT)\}.obj:
        $(CPP2OBJ) $<
 
-.rc{$(OJT)\}.res:
-       $(RC) /fo$(OJT)\$(<B).res $<
+.rc{$(OUT)\}.res:
+       $(RC) /fo$(OUT)\$(<B).res $<
 
 # Compile .rc (resource) files
 #.rc.res:
@@ -324,15 +335,17 @@ ldebug = /NODEFAULTLIB:LIBC
 afscflags = $(afscflags) /Od /Zi
 
 !IFDEF VADUMP
+!IF ("AFSVER_CL"=="1200")
 ldebug = $(ldebug) -debugtype:both
 ldebug = $(ldebug:-debugtype:cv=)
 !ENDIF
+!ENDIF
 
 !IFNDEF _CRTDBG_MAP_ALLOC
 mfclflags = $(mfclflags) /NODEFAULTLIB:msvcrtd.lib
 mfcdlllflags = $(mfcdlllflags) /NODEFAULTLIB:msvcrtd.lib
-#v6.0 doesn't work using msvcrtd.lib unless _CRTDBG_MAP_ALLOC is defined, v7.0 requires it
 
+#v6.0 doesn't work using msvcrtd.lib unless _CRTDBG_MAP_ALLOC is defined, v7.0 requires it
 !IF ("$(AFSVER_CL)"=="1200")
 EXEMFCLINK=$(EXEMFCLINK:/NODEFAULTLIB:msvcrtd.lib=)
 DLLMFCLINK=$(DLLMFCLINK:/NODEFAULTLIB:msvcrtd.lib=)