mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
[svn] Csaba's Watcom changes.
This commit is contained in:
hniksic
parent
67bfa88fd8
commit
f579cd1691
@ -26,6 +26,10 @@
|
||||
|
||||
* NEWS: Released Wget version 1.6.
|
||||
|
||||
2000-12-18 Csaba Raduly <csaba.raduly@sophos.com>
|
||||
|
||||
* windows/Makefile.watcom: Updated.
|
||||
|
||||
2000-12-10 Hrvoje Niksic <hniksic@arsdigita.com>
|
||||
|
||||
* po/POTFILES.in: Updated. [Not in 1.6 branch.]
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
2000-12-18 Csaba Raduly <csaba.raduly@sophos.com>
|
||||
|
||||
* sysdep.h: Include <malloc.h> and <io.h> under Watcom.
|
||||
|
||||
2000-12-31 Dan Harkless <wget@harkless.org>
|
||||
|
||||
* ChangeLog: Since this flat file doesn't have multiple branches,
|
||||
@ -121,17 +125,20 @@
|
||||
|
||||
2000-12-03 Christian Fraenkel <christian.fraenkel@gmx.net>
|
||||
|
||||
* Makefile.in: Added gen_sslfunc object.
|
||||
|
||||
* config.h.in: Added HAVE_SSL define.
|
||||
|
||||
* connect.c: Changed select_fd from static int to int.
|
||||
|
||||
* connect.h: Ditto.
|
||||
|
||||
* gen_sslfunc.h: New file.
|
||||
|
||||
* gen_sslfunc.c: Ditto.
|
||||
* Makefile.in: added gen_sslfunc object
|
||||
* config.h.in: added HAVE_SSL define
|
||||
* connect.c: changed select_fd from static int to int
|
||||
* connect.h: ditto
|
||||
* gen_sslfunc.h: New file
|
||||
* gen_sslfunc.c: ditto
|
||||
* http.c: added HTTPS fuctionality
|
||||
* retrc.c: ditto
|
||||
* url.c: ditto
|
||||
* init.c: added opt.httpsproxy
|
||||
* options.h: ditto
|
||||
* rbuf.h: added alternate rbuf struct
|
||||
* wget.h: added CONSSLERR
|
||||
* rbuf.c: ditto
|
||||
|
||||
* http.c: Added HTTPS fuctionality.
|
||||
|
||||
|
||||
14
src/sysdep.h
14
src/sysdep.h
@ -45,6 +45,20 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
#include <mswindows.h>
|
||||
#endif /* WINDOWS */
|
||||
|
||||
/* Watcom-specific stuff. In practice this is probably specific to
|
||||
Windows, although Watcom exists under other OS's too. For that
|
||||
reason, we keep this here. */
|
||||
|
||||
#ifdef __WATCOMC__
|
||||
/* Watcom has its own alloca() defined in malloc.h malloc.h needs to
|
||||
be included in the sources to prevent 'undefined external' errors
|
||||
at the link phase. */
|
||||
# include <malloc.h>
|
||||
/* io.h defines unlink() and chmod(). We put this here because it's
|
||||
way too obscure to require all the .c files to observe. */
|
||||
# include <io.h>
|
||||
#endif /* __WATCOMC__ */
|
||||
|
||||
/* Needed for compilation under OS/2: */
|
||||
#ifdef __EMX__
|
||||
#ifndef S_ISLNK
|
||||
|
||||
@ -1,22 +1,37 @@
|
||||
## Compiler, linker, and lib stuff
|
||||
## Makefile for use with watcom win95/winnt executable.
|
||||
|
||||
CC=wcc386
|
||||
CC=wcc386 /zq
|
||||
LINK=wlink
|
||||
|
||||
#disabled for faster compiler
|
||||
LFLAGS=sys nt op st=32767 op version=15013 op map
|
||||
CFLAGS=/zp4 /d1 /w4 /fpd /5s /fp5 /bm /mf /os /bt=nt /DWINDOWS /DHAVE_CONFIG_H /I=f:\lang\watcom\h;f:\lang\watcom\h\nt;f:\code\wgetb13\src
|
||||
LFLAGS=sys nt op st=32767 op vers=1.7 op map op q op de 'GNU wget 1.7dev'
|
||||
CFLAGS=/zp4 /d1 /w4 /fpd /5s /fp5 /bm /mf /os /bt=nt /DWINDOWS /DHAVE_CONFIG_H /I=$(%WATCOM)\h;$(%WATCOM)\h\nt;.
|
||||
# /zp4= pack structure members with this alignment
|
||||
# /d1 = line number debug info
|
||||
# /w4 = warning level
|
||||
# /fpd= ??? no such switch !
|
||||
# /5s = Pentium stack-based calling
|
||||
# /fp5= Pentium floating point
|
||||
# /bm = build multi-threaded
|
||||
# /mf = flat memory model
|
||||
# /os = optimize for size
|
||||
# /bt = "build target" (nt)
|
||||
|
||||
## variables
|
||||
OBJS = FILE ALLOCA.obj,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, &
|
||||
OBJS = FILE cmpt.obj,connect.obj,fnmatch.obj,ftp.obj,ftp-basic.obj, &
|
||||
ftp-ls.obj,ftpparse.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,url.obj,utils.obj,version.obj,mswindows.obj
|
||||
LINKOBJS = ALLOCA.obj 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 &
|
||||
#
|
||||
# NOTE: these two MUST be kept absolutely in sync
|
||||
# alas, no text functions in Watcom make :-(
|
||||
#
|
||||
LINKOBJS = cmpt.obj connect.obj fnmatch.obj ftp.obj ftp-basic.obj &
|
||||
ftp-ls.obj ftpparse.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 url.obj utils.obj version.obj mswindows.obj
|
||||
|
||||
|
||||
LIBFILES =
|
||||
|
||||
BINNAME=wget.exe
|
||||
@ -24,78 +39,33 @@ BINNAME=wget.exe
|
||||
$(BINNAME): $(LINKOBJS)
|
||||
$(LINK) $(LFLAGS) NAME $(BINNAME) $(OBJS) $(LIBPATH) $(LIBFILES)
|
||||
|
||||
alloca.obj : alloca.c config.h
|
||||
$(CC) $(CFLAGS) alloca.c
|
||||
|
||||
cmpt.obj : cmpt.c cmpt.h wget.h config.h
|
||||
$(CC) $(CFLAGS) cmpt.c
|
||||
|
||||
connect.obj : connect.c wget.h connect.h host.h config.h
|
||||
$(CC) $(CFLAGS) connect.c
|
||||
|
||||
fnmatch.obj : fnmatch.c wget.h fnmatch.h config.h
|
||||
$(CC) $(CFLAGS) fnmatch.c
|
||||
|
||||
ftp.obj : ftp.c wget.h utils.h url.h rbuf.h retr.h ftp.h html.h connect.h host.h fnmatch.h netrc.h config.h
|
||||
$(CC) $(CFLAGS) ftp.c
|
||||
|
||||
ftp-basic.obj : ftp-basic.c wget.h utils.h rbuf.h connect.h host.h config.h
|
||||
$(CC) $(CFLAGS) ftp-basic.c
|
||||
|
||||
ftp-ls.obj : ftp-ls.c wget.h utils.h ftp.h config.h
|
||||
$(CC) $(CFLAGS) ftp-ls.c
|
||||
|
||||
ftp-opie.obj : ftp-opie.c wget.h md5.h config.h
|
||||
$(CC) $(CFLAGS) ftp-opie.c
|
||||
|
||||
getopt.obj : getopt.c wget.h getopt.h config.h
|
||||
$(CC) $(CFLAGS) getopt.c
|
||||
|
||||
headers.obj : headers.c headers.h wget.h rbuf.h connect.h config.h
|
||||
$(CC) $(CFLAGS) headers.c
|
||||
|
||||
host.obj : host.c wget.h host.h utils.h url.h config.h
|
||||
$(CC) $(CFLAGS) host.c
|
||||
|
||||
html.obj : html.c wget.h url.h utils.h ftp.h html.h config.h
|
||||
$(CC) $(CFLAGS) html.c
|
||||
|
||||
http.obj : http.c wget.h utils.h url.h host.h rbuf.h retr.h headers.h connect.h fnmatch.h netrc.h config.h
|
||||
$(CC) $(CFLAGS) http.c
|
||||
|
||||
init.obj : init.c wget.h utils.h init.h host.h recur.h netrc.h config.h
|
||||
$(CC) $(CFLAGS) init.c
|
||||
|
||||
log.obj : log.c wget.h utils.h config.h
|
||||
$(CC) $(CFLAGS) log.c
|
||||
|
||||
main.obj : main.c wget.h utils.h getopt.h init.h retr.h host.h recur.h config.h mswindows.h
|
||||
$(CC) $(CFLAGS) main.c
|
||||
|
||||
md5.obj : md5.c wget.h md5.h config.h
|
||||
$(CC) $(CFLAGS) md5.c
|
||||
|
||||
mswindows.obj : mswindows.c wget.h url.h config.h
|
||||
$(CC) $(CFLAGS) mswindows.c
|
||||
|
||||
netrc.obj : netrc.c wget.h utils.h netrc.h init.h config.h
|
||||
$(CC) $(CFLAGS) netrc.c
|
||||
|
||||
rbuf.obj : rbuf.c wget.h rbuf.h connect.h config.h
|
||||
$(CC) $(CFLAGS) rbuf.c
|
||||
|
||||
recur.obj : recur.c wget.h url.h recur.h utils.h retr.h ftp.h fnmatch.h host.h config.h
|
||||
$(CC) $(CFLAGS) recur.c
|
||||
|
||||
retr.obj : retr.c wget.h utils.h retr.h url.h recur.h ftp.h host.h connect.h config.h
|
||||
$(CC) $(CFLAGS) retr.c
|
||||
|
||||
url.obj : url.c wget.h url.h host.h html.h utils.h config.h
|
||||
$(CC) $(CFLAGS) url.c
|
||||
|
||||
utils.obj : utils.c wget.h fnmatch.h utils.h config.h
|
||||
$(CC) $(CFLAGS) utils.c
|
||||
|
||||
version.obj : version.c config.h
|
||||
$(CC) $(CFLAGS) version.c
|
||||
cmpt.obj: cmpt.c wget.h sysdep.h options.h
|
||||
connect.obj: connect.c wget.h sysdep.h options.h connect.h host.h
|
||||
fnmatch.obj: fnmatch.c wget.h sysdep.h options.h fnmatch.h
|
||||
ftp-basic.obj: ftp-basic.c wget.h sysdep.h options.h utils.h rbuf.h connect.h host.h ftp.h
|
||||
ftp-ls.obj: ftp-ls.c wget.h sysdep.h options.h utils.h ftp.h rbuf.h url.h ftpparse.h
|
||||
ftp-opie.obj: ftp-opie.c wget.h sysdep.h options.h md5.h
|
||||
ftp.obj: ftp.c wget.h sysdep.h options.h utils.h url.h rbuf.h retr.h ftp.h connect.h host.h fnmatch.h netrc.h
|
||||
ftpparse.obj: ftpparse.c ftpparse.h
|
||||
getopt.obj: getopt.c wget.h sysdep.h options.h getopt.h
|
||||
hash.obj: hash.c wget.h sysdep.h options.h utils.h hash.h
|
||||
headers.obj: headers.c wget.h sysdep.h options.h connect.h rbuf.h headers.h
|
||||
host.obj: host.c wget.h sysdep.h options.h utils.h host.h url.h hash.h
|
||||
html-parse.obj: html-parse.c wget.h sysdep.h options.h html-parse.h
|
||||
html-url.obj: html-url.c wget.h sysdep.h options.h html-parse.h url.h utils.h
|
||||
http.obj: http.c 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
|
||||
init.obj: init.c wget.h sysdep.h options.h utils.h init.h host.h recur.h netrc.h
|
||||
log.obj: log.c wget.h sysdep.h options.h utils.h
|
||||
main.obj: main.c wget.h sysdep.h options.h utils.h getopt.h init.h retr.h rbuf.h recur.h host.h
|
||||
md5.obj: md5.c wget.h sysdep.h options.h md5.h
|
||||
netrc.obj: netrc.c wget.h sysdep.h options.h utils.h netrc.h init.h
|
||||
rbuf.obj: rbuf.c wget.h sysdep.h options.h rbuf.h connect.h
|
||||
recur.obj: recur.c wget.h sysdep.h options.h url.h recur.h utils.h retr.h rbuf.h ftp.h fnmatch.h host.h hash.h
|
||||
retr.obj: retr.c wget.h sysdep.h options.h utils.h retr.h rbuf.h url.h recur.h ftp.h host.h connect.h hash.h
|
||||
snprintf.obj: snprintf.c
|
||||
url.obj: url.c wget.h sysdep.h options.h utils.h url.h host.h
|
||||
utils.obj: utils.c wget.h sysdep.h options.h utils.h fnmatch.h hash.h
|
||||
version.obj: version.c
|
||||
|
||||
.c.obj:
|
||||
$(CC) $(CFLAGS) $[@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user