STABLE14-windows-makefile-fix-20050701

Fixes that were applied to the head as part of the IFS changes
but whose delta was not ready for the 1-4 branch.  afscdefs should
only include defines.  afscflags should only include compiler switches

update version to 1.3.8500

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 87fea4e14d5f8bfb08c2fde0ec8bcead14ba8449..08d8e849414a33d1369f443a83926829258d0808 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -80,7 +80,7 @@ LIB = $(AFSDEV_LIB)
 #define used in WinNT/2000 installation and program version display
 AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=3
-AFSPRODUCT_VER_PATCH=8400
+AFSPRODUCT_VER_PATCH=8500
 AFSPRODUCT_VER_BUILD=0
 
 # For MSI installer, each major release should have a different GUID
@@ -251,10 +251,10 @@ afscflags = $(afscflags) /GX
 !ENDIF
 
 !IF ("$(AFSVER_CL)"!="1200")
-afscdefs = $(afscdefs) /GT /GS
+afscflags = $(afscflags) /GT /GS
 #/Wp64
 !IF ("$(AFSVER_CL)"!="1400")
-afscdefs = $(afscdefs) /G7
+afscflags = $(afscflags) /G7
 !ENDIF
 !ENDIF
 
@@ -269,9 +269,11 @@ NODEBUG=1
 cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
 
 !IF ("$(AFSVER_CL)"=="1200")
-afscdefs = $(afscdefs) -DDEBUG /GZ
+afscdefs = $(afscdefs) -DDEBUG
+afscflags = $(afscflags) /GZ
 !ELSE 
-afscdefs = $(afscdefs) -DDEBUG /RTCs /RTCu
+afscdefs = $(afscdefs) -DDEBUG
+afscflags = $(afscflags) /RTCs /RTCu
 !ENDIF
 
 !IFDEF _CRTDBG_MAP_ALLOC

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index f0e28b00f0672a1d98a258993af961a81ddf19ae..30a70a5ff01e2c5537b67a542357cc51e893b2b6 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -80,7 +80,7 @@ LIB = $(AFSDEV_LIB)
 #define used in WinNT/2000 installation and program version display
 AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=3
-AFSPRODUCT_VER_PATCH=8400
+AFSPRODUCT_VER_PATCH=8500
 AFSPRODUCT_VER_BUILD=0
 
 # For MSI installer, each major release should have a different GUID
@@ -249,10 +249,10 @@ afscflags = $(afscflags) /GX
 !ENDIF
 
 !IF ("$(AFSVER_CL)"!="1200")
-afscdefs = $(afscdefs) /GT /GS
+afscflags = $(afscflags) /GT /GS
 #/Wp64
 !IF ("$(AFSVER_CL)"!="1400")
-afscdefs = $(afscdefs) /G7
+afscflags = $(afscflags) /G7
 !ENDIF
 !ENDIF
 
@@ -267,9 +267,11 @@ NODEBUG=1
 cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
 
 !IF ("$(AFSVER_CL)"=="1200")
-afscdefs = $(afscdefs) -DDEBUG /GZ
+afscdefs = $(afscdefs) -DDEBUG
+afscflags = $(afscflags) /GZ
 !ELSE 
-afscdefs = $(afscdefs) -DDEBUG /RTCs /RTCu
+afscdefs = $(afscdefs) -DDEBUG
+afscflags = $(afscflags) /RTCs /RTCu
 !ENDIF
 
 !IFDEF _CRTDBG_MAP_ALLOC

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index f0e28b00f0672a1d98a258993af961a81ddf19ae..30a70a5ff01e2c5537b67a542357cc51e893b2b6 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -80,7 +80,7 @@ LIB = $(AFSDEV_LIB)
 #define used in WinNT/2000 installation and program version display
 AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=3
-AFSPRODUCT_VER_PATCH=8400
+AFSPRODUCT_VER_PATCH=8500
 AFSPRODUCT_VER_BUILD=0
 
 # For MSI installer, each major release should have a different GUID
@@ -249,10 +249,10 @@ afscflags = $(afscflags) /GX
 !ENDIF
 
 !IF ("$(AFSVER_CL)"!="1200")
-afscdefs = $(afscdefs) /GT /GS
+afscflags = $(afscflags) /GT /GS
 #/Wp64
 !IF ("$(AFSVER_CL)"!="1400")
-afscdefs = $(afscdefs) /G7
+afscflags = $(afscflags) /G7
 !ENDIF
 !ENDIF
 
@@ -267,9 +267,11 @@ NODEBUG=1
 cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
 
 !IF ("$(AFSVER_CL)"=="1200")
-afscdefs = $(afscdefs) -DDEBUG /GZ
+afscdefs = $(afscdefs) -DDEBUG
+afscflags = $(afscflags) /GZ
 !ELSE 
-afscdefs = $(afscdefs) -DDEBUG /RTCs /RTCu
+afscdefs = $(afscdefs) -DDEBUG
+afscflags = $(afscflags) /RTCs /RTCu
 !ENDIF
 
 !IFDEF _CRTDBG_MAP_ALLOC