[svn] Define WGET_USE_STDARG in windows/config.h.bor.

[wget] / windows / Makefile.src

diff --git a/windows/Makefile.src b/windows/Makefile.src
index 4dbeb45c65cef56e31ff223ca7c01d4d7462f845..e402f1d7b1cd9cbc04aee9b763f739e197584666 100644 (file)
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -15,10 +15,27 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+# 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.
+
 #
 # Version: 1.4.4
 #
 
+#Comment these if you don't have openssl available - however https
+#won't work.
+SSLDEFS        =       /DHAVE_SSL
+SSLLIBS        =       libeay32.lib ssleay32.lib
+SSLSRC =       gen_sslfunc.c
+SSLOBJ =       gen_sslfunc$o
+
 SHELL = command
 
 VPATH       = .
@@ -38,7 +55,7 @@ LIBS     = kernel32.lib advapi32.lib wsock32.lib user32.lib
 
 INCLUDES = /I.
 
-COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS) $(DEBUGCF) $(DEFS) $(CFLAGS)
+COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS) $(DEBUGCF) $(DEFS) $(SSLDEFS) $(CFLAGS)
 LINK    = $(LD) $(LDFLAGS) $(DEBUGLF) /out:$@
 
 #INSTALL = @INSTALL@
@@ -46,13 +63,15 @@ LINK    = $(LD) $(LDFLAGS) $(DEBUGLF) /out:$@
 
 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
+SRC = cmpt.c safe-ctype.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c \
+      ftp-ls.c ftp-opie.c getopt.c hash.c headers.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 mswindows.c fnmatch.c gen-md5.c gnu-md5.c rbuf.c log.c $(SSLSRC)
 
-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
+OBJ = cmpt$o safe-ctype$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o \
+      ftp-ls$o ftp-opie$o getopt$o hash$o headers$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 mswindows$o fnmatch$o gen-md5$o gnu-md5$o rbuf$o log$o $(SSLOBJ)
 
 .SUFFIXES: .c .obj
 
@@ -64,7 +83,7 @@ OBJ = cmpt$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o ftp-ls$o \
 wget: wget.exe
 
 wget.exe: $(OBJ)
-         $(LD) @<< $(LDFLAGS) $(DEBUGLF) /out:$@ $(LIBS) $(OBJ)
+         $(LD) @<< $(LDFLAGS) $(DEBUGLF) /out:$@ $(LIBS) $(SSLLIBS) $(OBJ)
 <<
         ren wget.exe WGET.EXE
 
@@ -79,6 +98,7 @@ clean:
         $(RM) *.bak
         $(RM) *.pdb
         $(RM) *.map
+        $(RM) config.h
 
 distclean: clean
        $(RM) Makefile