X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=windows%2FMakefile.src;h=e9e3d2d3faf7d206abff6dfd40c501b8cce46c07;hp=c4946eb0a1d7d05aa1e6bff1db6bd63bb9a56c37;hb=edc9055768fed952b30629a9e8fa38ef68761882;hpb=0c4e666cb6bf1a8b978cae07e29d7325bc530cae

diff --git a/windows/Makefile.src b/windows/Makefile.src
index c4946eb0..e9e3d2d3 100644
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -1,9 +1,10 @@
 # Makefile for `wget' utility for MSVC
-# Copyright (C) 1995, 1996, 1997, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2004, 2006, 2007,
+# 2008 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -12,19 +13,18 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# 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.
+# Additional permission under GNU GPL version 3 section 7
 
+# If you modify this program, or any covered work, by linking or
+# combining it with the OpenSSL project's OpenSSL library (or a
+# modified version of that library), containing parts covered by the
+# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+# grants you additional permission to convey the resulting work.
+# Corresponding Source for a non-source form of such a combination
+# shall include the source code for the parts of OpenSSL used as well
+# as that of the covered work.
 
 # 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
@@ -32,8 +32,7 @@
 !ifndef NO_SSL
 SSLDEFS	= /DHAVE_SSL
 SSLLIBS	= libeay32.lib ssleay32.lib
-SSLSRC	= gen_sslfunc.c
-SSLOBJ	= gen_sslfunc$o
+SSLOBJ	= openssl$o http-ntlm$o
 !endif
 
 o = .obj
@@ -67,18 +66,11 @@ 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)
+      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 ptimer$o version$o xmalloc$o  \
+      mswindows$o gen-md5$o gnu-md5$o log$o $(SSLOBJ) spider$o
 
 .SUFFIXES: .c .obj
 
@@ -92,6 +84,11 @@ wget.exe: $(OBJ)
 	$(LD) @<< $(LDFLAGS) /out:$@ $(OBJ) $(LIBS)
 <<
 
+$(OBJ): config-post.h config.h connect.h convert.h cookies.h ftp.h \
+        gen-md5.h getopt.h gnu-md5.h hash.h host.h html-parse.h    \
+        http-ntlm.h init.h log.h mswindows.h netrc.h options.h     \
+        progress.h ptimer.h recur.h res.h retr.h safe-ctype.h      \
+        spider.h ssl.h sysdep.h url.h utils.h wget.h xmalloc.h
 
 #
 # Dependencies for cleanup
@@ -111,8 +108,3 @@ distclean: clean
 
 realclean: distclean
 	$(RM) TAGS
-
-# Dependencies:
-
-!include "..\windows\wget.dep"
-