Commit 71ab0cea authored by Yang Tse's avatar Yang Tse
Browse files

build: sort configuration hunks in lib/Makefile.vc6 

sorted to reflect same internal order as the one shown
in the usage message.
parent 9acac919

lib/Makefile.vc6

+46 −46
Original line number Diff line number Diff line
@@ -145,30 +145,6 @@ CC = $(CCNODBG) $(RTLIB) $(CFLAGSLIB) 
CFGSET = TRUE

!ENDIF



######################

# release-zlib



!IF "$(CFG)" == "release-zlib"

TARGET   = $(LIBCURL_STA_LIB_REL)

DIROBJ   = $(CFG)

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)

CFGSET   = TRUE

!ENDIF



######################

# release-dll



!IF "$(CFG)" == "release-dll"

TARGET = $(LIBCURL_DYN_LIB_REL)

DIROBJ = $(CFG)

LNK    = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)

CC     = $(CCNODBG) $(RTLIB)

CFGSET = TRUE

RESOURCE = $(DIROBJ)\libcurl.res

!ENDIF



######################

# release-ssl
@@ -182,14 +158,14 @@ CFGSET = TRUE 
!ENDIF



######################

# release-ssl-dll

# release-zlib



!IF "$(CFG)" == "release-ssl-dll"

!IF "$(CFG)" == "release-zlib"

TARGET   = $(LIBCURL_STA_LIB_REL)

DIROBJ   = $(CFG)

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)

CFGSET   = TRUE

!ENDIF
@@ -207,16 +183,15 @@ CFGSET = TRUE 
!ENDIF



######################

# release-dll-ssl-dll

# release-ssl-dll



!IF "$(CFG)" == "release-dll-ssl-dll"

TARGET   = $(LIBCURL_DYN_LIB_REL)

!IF "$(CFG)" == "release-ssl-dll"

TARGET   = $(LIBCURL_STA_LIB_REL)

DIROBJ   = $(CFG)

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)

CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)

LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)

CFGSET   = TRUE

RESOURCE = $(DIROBJ)\libcurl.res

!ENDIF



######################
@@ -244,6 +219,31 @@ CC = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB) 
CFGSET   = TRUE

!ENDIF



######################

# release-dll



!IF "$(CFG)" == "release-dll"

TARGET = $(LIBCURL_DYN_LIB_REL)

DIROBJ = $(CFG)

LNK    = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)

CC     = $(CCNODBG) $(RTLIB)

CFGSET = TRUE

RESOURCE = $(DIROBJ)\libcurl.res

!ENDIF



######################

# release-dll-ssl-dll



!IF "$(CFG)" == "release-dll-ssl-dll"

TARGET   = $(LIBCURL_DYN_LIB_REL)

DIROBJ   = $(CFG)

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)

CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)

CFGSET   = TRUE

RESOURCE = $(DIROBJ)\libcurl.res

!ENDIF



######################

# release-dll-zlib-dll
@@ -307,27 +307,27 @@ CFGSET = TRUE 
!ENDIF



######################

# debug-ssl-dll

# debug-ssl-zlib



!IF "$(CFG)" == "debug-ssl-dll"

!IF "$(CFG)" == "debug-ssl-zlib"

TARGET   = $(LIBCURL_STA_LIB_DBG)

DIROBJ   = $(CFG)

LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)\out32dll

LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

CFGSET   = TRUE

!ENDIF



######################

# debug-ssl-zlib

# debug-ssl-dll



!IF "$(CFG)" == "debug-ssl-zlib"

!IF "$(CFG)" == "debug-ssl-dll"

TARGET   = $(LIBCURL_STA_LIB_DBG)

DIROBJ   = $(CFG)

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)\out32dll

LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)

CFGSET   = TRUE

!ENDIF