From: hniksic Date: Mon, 19 Nov 2001 15:13:38 +0000 (-0800) Subject: [svn] Update windows Makefiles and dependencies. X-Git-Tag: v1.13~2063 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=38279627b9f629db76b2daf93da8332308f01945 [svn] Update windows Makefiles and dependencies. Submitted by Herold Heiko. --- diff --git a/ChangeLog b/ChangeLog index 5fc352df..45d6568e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-05-14 Herold Heiko + + * windows/Makefile.src: + * windows/Makefile.src.bor: + * windows/Makefile.watcom: + * windows/config.h.bor: + * windows/config.h.ms: + * windows/wget.dep: + Windows update. + 2001-11-18 Hrvoje Niksic * configure.in: Check for getopt_long in libc. diff --git a/windows/Makefile.src b/windows/Makefile.src index ef297667..f1739f78 100644 --- a/windows/Makefile.src +++ b/windows/Makefile.src @@ -54,13 +54,13 @@ RM = del 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 \ - retr.c recur.c url.c cookies.c init.c utils.c main.c version.c \ - mswindows.c fnmatch.c md5.c rbuf.c log.c $(SSLSRC) + retr.c recur.c res.c url.c cookies.c init.c utils.c main.c version.c \ + mswindows.c fnmatch.c gnu-md5.c rbuf.c log.c $(SSLSRC) 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 \ - retr$o recur$o url$o cookies$o init$o utils$o main$o version$o \ - mswindows$o fnmatch$o md5$o rbuf$o log$o $(SSLOBJ) + retr$o recur$o res$o url$o cookies$o init$o utils$o main$o version$o \ + mswindows$o fnmatch$o gnu-md5$o rbuf$o log$o $(SSLOBJ) .SUFFIXES: .c .obj diff --git a/windows/Makefile.src.bor b/windows/Makefile.src.bor index e0800b99..b3b2818a 100644 --- a/windows/Makefile.src.bor +++ b/windows/Makefile.src.bor @@ -10,9 +10,9 @@ CFLAGS=-DWINDOWS -DHAVE_CONFIG_H -I. -H -H=wget.csm -w- ## variables OBJS=cmpt.obj connect.obj fnmatch.obj ftp.obj ftp-basic.obj \ ftp-ls.obj ftp-opie.obj getopt.obj headers.obj host.obj html.obj \ - http.obj init.obj log.obj main.obj md5.obj netrc.obj rbuf.obj \ + http.obj init.obj log.obj main.obj gnu-md5.obj netrc.obj rbuf.obj \ alloca.obj \ - recur.obj retr.obj url.obj utils.obj version.obj mswindows.obj + recur.obj res.obj retr.obj url.obj utils.obj version.obj mswindows.obj LIBDIR=$(MAKEDIR)\..\lib @@ -25,11 +25,12 @@ version.obj+ utils.obj+ url.obj+ retr.obj+ +res.obj+ recur.obj+ rbuf.obj+ netrc.obj+ mswindows.obj+ -md5.obj+ +gnu-md5.obj+ main.obj+ log.obj+ init.obj+ diff --git a/windows/Makefile.watcom b/windows/Makefile.watcom index fc051d2e..47e21c4b 100644 --- a/windows/Makefile.watcom +++ b/windows/Makefile.watcom @@ -53,8 +53,8 @@ CFLAGS+= /os /d2 OBJS = cmpt.obj connect.obj cookies.obj fnmatch.obj ftp.obj ftp-basic.obj & ftp-ls.obj ftp-opie.obj getopt.obj hash.obj headers.obj host.obj html-parse.obj html-url.obj & - http.obj init.obj log.obj main.obj md5.obj netrc.obj rbuf.obj & - recur.obj retr.obj safe-ctype.obj url.obj utils.obj version.obj mswindows.obj + http.obj init.obj log.obj main.obj gnu-md5.obj netrc.obj rbuf.obj & + recur.obj res.obj retr.obj safe-ctype.obj url.obj utils.obj version.obj mswindows.obj LIBFILES = # diff --git a/windows/config.h.bor b/windows/config.h.bor index 736f4fe3..c718cf67 100644 --- a/windows/config.h.bor +++ b/windows/config.h.bor @@ -167,4 +167,13 @@ char *alloca (); /* Define to 1 if ANSI function prototypes are usable. */ #define PROTOTYPES 1 +/* Define if we're compiling in support for MD5. */ +#define HAVE_MD5 1 + +/* Define if we're using Solaris libmd5. */ +#undef HAVE_SOLARIS_MD5 + +/* Define if we're using builtin (GNU) md5.c. */ +#define HAVE_BUILTIN_MD5 1 + #endif /* CONFIG_H */ diff --git a/windows/config.h.ms b/windows/config.h.ms index 60692de8..6d747110 100644 --- a/windows/config.h.ms +++ b/windows/config.h.ms @@ -173,6 +173,15 @@ char *alloca (); /* Define to 1 if ANSI function prototypes are usable. */ #define PROTOTYPES 1 +/* Define if we're compiling in support for MD5. */ +#define HAVE_MD5 1 + +/* Define if we're using Solaris libmd5. */ +#undef HAVE_SOLARIS_MD5 + +/* Define if we're using builtin (GNU) md5.c. */ +#define HAVE_BUILTIN_MD5 1 + /* Work around VC 6 issues */ #define inline __inline #define ftruncate chsize diff --git a/windows/wget.dep b/windows/wget.dep index c596bd6f..848c1534 100644 --- a/windows/wget.dep +++ b/windows/wget.dep @@ -6,7 +6,7 @@ cookies$o: cookies.c wget.h cookies.h hash.h url.h utils.h fnmatch$o: fnmatch.c config.h wget.h sysdep.h options.h fnmatch.h ftp-basic$o: ftp-basic.c config.h wget.h sysdep.h options.h utils.h rbuf.h connect.h host.h ftp-ls$o: ftp-ls.c config.h wget.h sysdep.h options.h utils.h ftp.h url.h -ftp-opie$o: ftp-opie.c config.h wget.h sysdep.h options.h md5.h +ftp-opie$o: ftp-opie.c config.h wget.h sysdep.h options.h gnu-md5.h ftp$o: ftp.c config.h wget.h sysdep.h options.h utils.h url.h rbuf.h retr.h ftp.h connect.h host.h fnmatch.h netrc.h getopt$o: getopt.c wget.h sysdep.h options.h getopt.h hash$o: hash.c wget.h utils.h hash.h @@ -15,11 +15,11 @@ host$o: host.c config.h wget.h sysdep.h options.h utils.h host.h url.h hash.h html-parse$o: wget.h html-parse.h html-url$o: wget.h html-parse.h url.h utils.h html$o: wget.h url.h utils.h ftp.h -http$o: http.c config.h wget.h sysdep.h options.h utils.h url.h host.h rbuf.h retr.h headers.h connect.h fnmatch.h netrc.h md5.h +http$o: http.c config.h wget.h sysdep.h options.h utils.h url.h host.h rbuf.h retr.h headers.h connect.h fnmatch.h netrc.h gnu-md5.h init$o: init.c config.h wget.h sysdep.h options.h utils.h init.h host.h recur.h netrc.h log$o: log.c config.h wget.h sysdep.h options.h utils.h main$o: main.c config.h wget.h sysdep.h options.h utils.h getopt.h init.h retr.h recur.h host.h -md5$o: md5.c wget.h sysdep.h options.h md5.h +gnu-md5$o: gnu-md5.c wget.h sysdep.h options.h gnu-md5.h mswindows$o: wget.h url.h netrc$o: netrc.c wget.h sysdep.h options.h utils.h netrc.h init.h rbuf$o: rbuf.c config.h wget.h sysdep.h options.h rbuf.h connect.h