X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=windows%2FMakefile.src;h=c4946eb0a1d7d05aa1e6bff1db6bd63bb9a56c37;hp=4dbeb45c65cef56e31ff223ca7c01d4d7462f845;hb=713ecfdca60257c645c6be6ae47b872b59fc050f;hpb=2f6cd9d698acbee2ffcf60d6b6d04ad5d84324fc

diff --git a/windows/Makefile.src b/windows/Makefile.src
index 4dbeb45c..c4946eb0 100644
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -1,5 +1,5 @@
-# Makefile for `wget' utility for MSVC 4.0
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Makefile for `wget' utility for MSVC
+# Copyright (C) 1995, 1996, 1997, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,58 +15,82 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#
-# Version: 1.4.4
-#
-
-SHELL = command
-
-VPATH       = .
-o           = .obj
-OUTDIR      = .
-
-CC       = cl
-LD       = link
-
-CFLAGS   = /nologo /MT /W0 /O2
-#DEBUGCF  = /DDEBUG /Zi /Od #/Fd /FR
-CPPFLAGS = 
-DEFS     = /DWINDOWS /D_CONSOLE /DHAVE_CONFIG_H /DSYSTEM_WGETRC=\"wgetrc\"
-LDFLAGS  = /subsystem:console /incremental:no /warn:3
-#DEBUGLF  = /pdb:wget.pdb /debug /debugtype:cv /map:wget.map /opt:noref
-LIBS     = kernel32.lib advapi32.lib wsock32.lib user32.lib
-
-INCLUDES = /I.
-
-COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS) $(DEBUGCF) $(DEFS) $(CFLAGS)
-LINK    = $(LD) $(LDFLAGS) $(DEBUGLF) /out:$@
-
-#INSTALL = @INSTALL@
-#INSTALL_PROGRAM = @INSTALL_PROGRAM@
-
-RM      = del
-
-SRC = cmpt.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c ftp-ls.c \
-      ftp-opie.c ftpparse.c getopt.c hash.c headers.c html-parse.c html-url.c retr.c recur.c url.c init.c utils.c main.c \
-      version.c mswindows.c fnmatch.c md5.c rbuf.c log.c
-
-OBJ = cmpt$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o ftp-ls$o \
-      ftp-opie$o ftpparse$o getopt$o hash$o headers$o html-parse$o html-url$o retr$o recur$o url$o init$o utils$o main$o \
-      version$o mswindows$o fnmatch$o md5$o rbuf$o log$o
+# In addition, as a special exception, the Free Software Foundation
+# gives permission to link the code of its release of Wget with the
+# OpenSSL project's "OpenSSL" library (or with modified versions of it
+# that use the same license as the "OpenSSL" library), and distribute
+# the linked executables.  You must obey the GNU General Public License
+# in all respects for all of the code used other than "OpenSSL".  If you
+# modify this file, you may extend this exception to your version of the
+# file, but you are not obligated to do so.  If you do not wish to do
+# so, delete this exception statement from your version.
+
+
+# SSL (https) support requires the OpenSSL library (see http://www.openssl.org/).
+# If you do not have OpenSSL installed or wish to build Wget without SSL
+# support, either comment-out the following lines or define NO_SSL.
+!ifndef NO_SSL
+SSLDEFS	= /DHAVE_SSL
+SSLLIBS	= libeay32.lib ssleay32.lib
+SSLSRC	= gen_sslfunc.c
+SSLOBJ	= gen_sslfunc$o
+!endif
+
+o = .obj
+
+CC	= cl
+LD	= link
+RM	= -del
+
+DEFS	= /DWINDOWS /D_CONSOLE /DHAVE_CONFIG_H $(SSLDEFS)
+LIBS	= kernel32.lib advapi32.lib wsock32.lib user32.lib gdi32.lib $(SSLLIBS)
+
+!ifdef DEBUG
+CFLAGS	= /nologo /MTd /Od /Zi /I. $(DEFS)
+LDFLAGS	= /debug
+!else
+CFLAGS	= /nologo /MT /O2 /I. $(DEFS)
+LDFLAGS	= /opt:ref #/opt:nowin98
+!endif
+
+
+# The following enables security checks and is recommended if you are using
+# MSVC 7.0 (or later) for 80x86.
+!ifdef SECURITY_CHECKS
+CFLAGS	= $(CFLAGS) /GS
+!endif
+
+# The following enables link-time code generation (Cross-file
+# interprocedural optimizations).
+!ifdef LTCG
+CFLAGS	= $(CFLAGS) /GL
+LDFLAGS	= $(LDFLAGS) /ltcg:status
+!endif
+
+
+SRC = cmpt.c safe-ctype.c convert.c connect.c host.c http.c netrc.c \
+      ftp-basic.c ftp.c ftp-ls.c ftp-opie.c getopt.c hash.c \
+      html-parse.c html-url.c progress.c retr.c recur.c res.c url.c cookies.c \
+      init.c utils.c main.c version.c xmalloc.c mswindows.c \
+      gen-md5.c gnu-md5.c log.c $(SSLSRC)
+
+OBJ = cmpt$o safe-ctype$o convert$o connect$o host$o http$o netrc$o \
+      ftp-basic$o ftp$o ftp-ls$o ftp-opie$o getopt$o hash$o \
+      html-parse$o html-url$o progress$o retr$o recur$o res$o url$o cookies$o \
+      init$o utils$o main$o version$o xmalloc$o mswindows$o \
+      gen-md5$o gnu-md5$o log$o $(SSLOBJ)
 
 .SUFFIXES: .c .obj
 
-.c.obj:
-        $(COMPILE) /c $<
+# If this doesn't work for you, remove the second colon.
+.c.obj::
+	$(CC) $(CFLAGS) /c $<
 
 # Dependencies for building
 
-wget: wget.exe
-
 wget.exe: $(OBJ)
-         $(LD) @<< $(LDFLAGS) $(DEBUGLF) /out:$@ $(LIBS) $(OBJ)
+	$(LD) @<< $(LDFLAGS) /out:$@ $(OBJ) $(LIBS)
 <<
-        ren wget.exe WGET.EXE
 
 
 #
@@ -74,14 +98,16 @@ wget.exe: $(OBJ)
 #
 
 clean:
-        $(RM) *.obj
-        $(RM) *.exe
-        $(RM) *.bak
-        $(RM) *.pdb
-        $(RM) *.map
+	$(RM) *.bak
+	$(RM) *.obj
+	$(RM) *.exe
+	$(RM) *.pdb
+	$(RM) *.map
+	$(RM) *.ilk
 
 distclean: clean
 	$(RM) Makefile
+	$(RM) config.h
 
 realclean: distclean
 	$(RM) TAGS
@@ -89,3 +115,4 @@ realclean: distclean
 # Dependencies:
 
 !include "..\windows\wget.dep"
+