build: sort configuration hunks in lib/Makefile.vc6

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

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 278af1d25a71a31aced718b3800f52da3830c9d8..1d8459e6923fc3dd79c065c19eb6554b874a2347 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -145,30 +145,6 @@ CC     = $(CCNODBG) $(RTLIB) $(CFLAGSLIB)
 CFGSET = TRUE\r
 !ENDIF\r
 \r
-######################\r
-# release-zlib\r
-\r
-!IF "$(CFG)" == "release-zlib"\r
-TARGET   = $(LIBCURL_STA_LIB_REL)\r
-DIROBJ   = $(CFG)\r
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)\r
-CFGSET   = TRUE\r
-!ENDIF\r
-\r
-######################\r
-# release-dll\r
-\r
-!IF "$(CFG)" == "release-dll"\r
-TARGET = $(LIBCURL_DYN_LIB_REL)\r
-DIROBJ = $(CFG)\r
-LNK    = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)\r
-CC     = $(CCNODBG) $(RTLIB)\r
-CFGSET = TRUE\r
-RESOURCE = $(DIROBJ)\libcurl.res\r
-!ENDIF\r
-\r
 ######################\r
 # release-ssl\r
 \r
@@ -182,14 +158,14 @@ CFGSET   = TRUE
 !ENDIF\r
 \r
 ######################\r
-# release-ssl-dll\r
+# release-zlib\r
 \r
-!IF "$(CFG)" == "release-ssl-dll"\r
+!IF "$(CFG)" == "release-zlib"\r
 TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
-LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -207,16 +183,15 @@ CFGSET   = TRUE
 !ENDIF\r
 \r
 ######################\r
-# release-dll-ssl-dll\r
+# release-ssl-dll\r
 \r
-!IF "$(CFG)" == "release-dll-ssl-dll"\r
-TARGET   = $(LIBCURL_DYN_LIB_REL)\r
+!IF "$(CFG)" == "release-ssl-dll"\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
-LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)\r
-CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)\r
+LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
-RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r
 \r
 ######################\r
@@ -244,6 +219,31 @@ CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
+######################\r
+# release-dll\r
+\r
+!IF "$(CFG)" == "release-dll"\r
+TARGET = $(LIBCURL_DYN_LIB_REL)\r
+DIROBJ = $(CFG)\r
+LNK    = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)\r
+CC     = $(CCNODBG) $(RTLIB)\r
+CFGSET = TRUE\r
+RESOURCE = $(DIROBJ)\libcurl.res\r
+!ENDIF\r
+\r
+######################\r
+# release-dll-ssl-dll\r
+\r
+!IF "$(CFG)" == "release-dll-ssl-dll"\r
+TARGET   = $(LIBCURL_DYN_LIB_REL)\r
+DIROBJ   = $(CFG)\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
+LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)\r
+CFGSET   = TRUE\r
+RESOURCE = $(DIROBJ)\libcurl.res\r
+!ENDIF\r
+\r
 ######################\r
 # release-dll-zlib-dll\r
 \r
@@ -307,27 +307,27 @@ CFGSET   = TRUE
 !ENDIF\r
 \r
 ######################\r
-# debug-ssl-dll\r
+# debug-ssl-zlib\r
 \r
-!IF "$(CFG)" == "debug-ssl-dll"\r
+!IF "$(CFG)" == "debug-ssl-zlib"\r
 TARGET   = $(LIBCURL_STA_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
-LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)\out32dll\r
-LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
+LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
 ######################\r
-# debug-ssl-zlib\r
+# debug-ssl-dll\r
 \r
-!IF "$(CFG)" == "debug-ssl-zlib"\r
+!IF "$(CFG)" == "debug-ssl-dll"\r
 TARGET   = $(LIBCURL_STA_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
-LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)\out32dll\r
+LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r