winbuild: Clean up formatting and variable naming

- Changed space usage to line up with the whole file
- Renamed CFLAGS_SSPI/IPV6 to SSPI/IPV6_CFLAGS to be
  consistent with the other CFLAGS_x variables
- Make use of existing CFLAGS_IPV6 (previously IPV6_CFLAGS)
  instead of appending directly to CFLAGS

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 59e29d6c1652e1e01e3242ea79588b1c802936f9..0bccc98014b919c29464dc9e54db21b4fa305301 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -106,7 +106,7 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-release\r
 !ENDIF\r
 \r
-!IF "$(AS_DLL)" == "true"\r
+!IF "$(AS_DLL)"=="true"\r
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-dll\r
 !ELSE\r
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static\r

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 277ea5533eb086ef235d649c8a50089880e85972..442e3c578b236f8d9690980c8a1871378167e607 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -154,7 +154,7 @@ USE_WINSSL  = true
 !ENDIF\r
 \r
 !IF "$(USE_WINSSL)"=="true"\r
-CFLAGS_SSPI  = /DUSE_SCHANNEL\r
+SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL\r
 USE_SCHANNEL = true\r
 USE_SSPI     = yes\r
 !ENDIF\r
@@ -165,8 +165,8 @@ USE_SSPI = yes
 !ENDIF\r
 \r
 !IF "$(USE_SSPI)"=="yes"\r
-CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_WINDOWS_SSPI\r
 USE_SSPI    = true\r
+SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI\r
 !ENDIF\r
 \r
 \r
@@ -177,7 +177,7 @@ USE_IPV6  = true
 !ENDIF\r
 \r
 !IF "$(USE_IPV6)"=="true"\r
-CFLAGS    = $(CFLAGS) /DUSE_IPV6\r
+IPV6_CFLAGS = $(IPV6_CFLAGS) /DUSE_IPV6\r
 !ENDIF\r
 \r
 \r
@@ -195,7 +195,7 @@ LFLAGS    = $(LFLAGS) Normaliz.lib
 \r
 \r
 !IF "$(GEN_PDB)"=="yes"\r
-GEN_PDB=true\r
+GEN_PDB = true\r
 !ENDIF\r
 \r
 !IFNDEF MACHINE\r
@@ -207,11 +207,11 @@ MANIFESTTOOL = mt -manifest $(DIRDIST)\$(PROGRAM_NAME).manifest -outputresource:
 !ENDIF\r
 \r
 # Runtime library configuration\r
-!IF "$(RTLIBCFG)" == "static"\r
-RTLIB  = /MT\r
+!IF "$(RTLIBCFG)"=="static"\r
+RTLIB = /MT\r
 RTLIB_DEBUG = /MTd\r
 !ELSE\r
-RTLIB   = /MD\r
+RTLIB = /MD\r
 RTLIB_DEBUG  = /MDd\r
 !ENDIF\r
 \r
@@ -219,12 +219,12 @@ RTLIB_DEBUG  = /MDd
 TARGET = $(LIB_NAME_STATIC)\r
 CURL_LIBCURL_LIBNAME=$(LIB_NAME_STATIC)\r
 AS_DLL = false\r
-CFGSET=true\r
+CFGSET = true\r
 !ELSEIF "$(MODE)"=="dll"\r
 TARGET = $(LIB_NAME_DLL)\r
 CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)\r
 AS_DLL = true\r
-CFGSET=true\r
+CFGSET = true\r
 !ENDIF\r
 \r
 WIN_LIBS    = ws2_32.lib wldap32.lib\r
@@ -303,12 +303,12 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh2-$(SSH2)
 !ENDIF\r
 \r
 !IF "$(USE_IPV6)"=="true"\r
-CFLAGS = $(CFLAGS) $(CFLAGS_IPV6)\r
+CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)\r
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6\r
 !ENDIF\r
 \r
 !IF "$(USE_SSPI)"=="true"\r
-CFLAGS = $(CFLAGS) $(CFLAGS_SSPI)\r
+CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)\r
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi\r
 !ENDIF\r
 \r
@@ -356,8 +356,8 @@ clean:
 !include CURL_OBJS.inc\r
 !include LIBCURL_OBJS.inc\r
 \r
-LIB_OBJS= $(LIBCURL_OBJS)\r
-EXE_OBJS= $(CURL_OBJS)\r
+LIB_OBJS = $(LIBCURL_OBJS)\r
+EXE_OBJS = $(CURL_OBJS)\r
 \r
 all : $(TARGET) $(PROGRAM_NAME)\r
 \r