1
0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00

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
This commit is contained in:
Marc Hoersken 2012-07-05 08:39:40 +02:00
parent 825fff880e
commit aeca33f96c
2 changed files with 14 additions and 14 deletions

View File

@ -154,7 +154,7 @@ USE_WINSSL = true
!ENDIF
!IF "$(USE_WINSSL)"=="true"
CFLAGS_SSPI = /DUSE_SCHANNEL
SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
USE_SCHANNEL = true
USE_SSPI = yes
!ENDIF
@ -165,8 +165,8 @@ USE_SSPI = yes
!ENDIF
!IF "$(USE_SSPI)"=="yes"
CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_WINDOWS_SSPI
USE_SSPI = true
SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
!ENDIF
@ -177,7 +177,7 @@ USE_IPV6 = true
!ENDIF
!IF "$(USE_IPV6)"=="true"
CFLAGS = $(CFLAGS) /DUSE_IPV6
IPV6_CFLAGS = $(IPV6_CFLAGS) /DUSE_IPV6
!ENDIF
@ -303,12 +303,12 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh2-$(SSH2)
!ENDIF
!IF "$(USE_IPV6)"=="true"
CFLAGS = $(CFLAGS) $(CFLAGS_IPV6)
CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6
!ENDIF
!IF "$(USE_SSPI)"=="true"
CFLAGS = $(CFLAGS) $(CFLAGS_SSPI)
CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi
!ENDIF