*** /home/mikep/Makefile.vc6.lib.new	Wed Mar 26 09:57:50 2008
--- curl/curl-7.18.0/lib/Makefile.vc6	Wed Mar 19 08:55:51 2008
***************
*** 1,5 ****
  #############################################################
! # $Id: Makefile.vc6,v 1.1.1.1 2008-03-19 08:55:51 mikep Exp $
  #
  # Makefile for building libcurl with MSVC6
  #
--- 1,5 ----
  #############################################################
! # $Id: Makefile.vc6,v 1.1.1.1 2008/03/19 08:55:51 mikep Exp $
  #
  # Makefile for building libcurl with MSVC6
  #
***************
*** 28,34 ****
  LIB_NAME       = libcurl
  LIB_NAME_DEBUG = libcurld
  
- 
  #
  # Stem for DLL import libs
  #
--- 28,33 ----
***************
*** 43,52 ****
  ZLIB_PATH  = ../../zlib-1.2.3
  !ENDIF
  
- !IFNDEF SSH2_PATH
- SSH2_PATH  = ../../libssh2-0.18
- !ENDIF
- 
  !IFNDEF MACHINE
  MACHINE  = X86
  !ENDIF
--- 42,47 ----
***************
*** 80,95 ****
  
  CCNODBG    = cl.exe /O2 /DNDEBUG
  CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ
! CFLAGSSSL  = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/include" /I "$(OPENSSL_PATH)/include/openssl"
  CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
- CFLAGSSSH2 = /DHAVE_LIBSSH2_H /DHAVE_SSH2 /DUSE_LIBSSH2 /DLIBSSH2_WIN32 /I "$(SSH2_PATH)/include"
  CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL
  CFLAGSLIB  = /DCURL_STATICLIB
  LNKDLL     = link.exe /DLL
  LNKLIB     = link.exe /lib
  LFLAGS     = /nologo /machine:$(MACHINE)
  SSLLIBS    = libeay32.lib ssleay32.lib
- SSH2LIBS    = libssh2.lib
  ZLIBLIBSDLL= zdll.lib
  ZLIBLIBS   = zlib.lib
  !IFDEF USEMM_LIBS
--- 75,88 ----
  
  CCNODBG    = cl.exe /O2 /DNDEBUG
  CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ
! CFLAGSSSL  = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
  CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
  CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL
  CFLAGSLIB  = /DCURL_STATICLIB
  LNKDLL     = link.exe /DLL
  LNKLIB     = link.exe /lib
  LFLAGS     = /nologo /machine:$(MACHINE)
  SSLLIBS    = libeay32.lib ssleay32.lib
  ZLIBLIBSDLL= zdll.lib
  ZLIBLIBS   = zlib.lib
  !IFDEF USEMM_LIBS
***************
*** 203,222 ****
  !ENDIF
  
  ######################
- # release-dll-ssl-dll-ssh2-dll
- 
- !IF "$(CFG)" == "release-dll-ssl-dll-ssh2-dll"
- TARGET   = $(LIB_NAME).dll
- DIROBJ   = $(CFG)
- LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\lib"
- LFLAGSSSH2 = "/LIBPATH:$(SSH2_PATH)\lib"
- LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(SSH2LIBS) $(LFLAGSSSL) $(LFLAGSSSH2) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib
- CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2)
- CFGSET   = TRUE
- RESOURCE = $(DIROBJ)\libcurl.res
- !ENDIF
- 
- ######################
  # release-zlib-dll
  
  !IF "$(CFG)" == "release-zlib-dll"
--- 196,201 ----
***************
*** 460,466 ****
  	$(DIROBJ)\escape.obj \
  	$(DIROBJ)\formdata.obj \
  	$(DIROBJ)\ftp.obj \
- 	$(DIROBJ)\ssh.obj \
  	$(DIROBJ)\http.obj \
  	$(DIROBJ)\http_chunks.obj \
  	$(DIROBJ)\ldap.obj \
--- 439,444 ----
***************
*** 544,550 ****
  
  release-dll\libcurl.res \
  release-dll-ssl-dll\libcurl.res \
- release-dll-ssl-dll-ssh2-dll\libcurl.res \
  release-dll-zlib-dll\libcurl.res \
  release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
  	rc /dCURLDEBUG=0 /Fo $@ libcurl.rc
--- 522,527 ----