From 33c0e509e0d7b3e714603e9e90e24c449d48c1d3 Mon Sep 17 00:00:00 2001 From: hniksic Date: Wed, 19 Dec 2001 10:23:10 -0800 Subject: [PATCH] [svn] Update Makefiles to work with the Watcom compiler. Submitted by Csaba Raduly in . --- ChangeLog | 7 +++++++ configure.bat | 17 ++++++++++++++++- windows/Makefile.watcom | 5 ++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e53e10fa..ab21f978 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-12-19 Csaba Raduly + + * windows/Makefile.watcom: add gen-md5.obj and progress.obj to the + list of "sources" + + * configure.bat: add section for Watcom + 2001-12-13 Hrvoje Niksic * po/ja.po: Ditto. diff --git a/configure.bat b/configure.bat index 4d19629f..9864659a 100644 --- a/configure.bat +++ b/configure.bat @@ -19,6 +19,7 @@ rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. cls if .%1 == .--borland goto :borland if .%1 == .--msvc goto :msvc +if .%1 == .--watcom goto :watcom if not .%BORPATH% == . goto :borland if not .%1 == . goto :usage @@ -42,6 +43,20 @@ copy windows\Makefile.doc doc\Makefile > nul echo Type MAKE to start compiling. goto :end +:watcom +copy windows\config.h.ms src\config.h > nul +copy windows\Makefile.watcom src\Makefile > nul + +@echo Checking environment vars +@set INCLUDE | find /I "WATCOM" +@set LIB | find /I "WATCOM" +@echo If WATCOM directories were not displayed, you need to +@echo SET INCLUDE and SET LIB to the Watcom directories +@echo. +cd src +@echo Type WMAKE to build +goto :end + :usage -echo Usage: Configure [--borland | --msvc] +echo Usage: Configure [--borland | --msvc | --watcom] :end diff --git a/windows/Makefile.watcom b/windows/Makefile.watcom index 47e21c4b..81811330 100644 --- a/windows/Makefile.watcom +++ b/windows/Makefile.watcom @@ -53,7 +53,7 @@ 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 gnu-md5.obj netrc.obj rbuf.obj & + http.obj init.obj log.obj main.obj gen-md5.obj gnu-md5.obj netrc.obj progress.obj rbuf.obj & recur.obj res.obj retr.obj safe-ctype.obj url.obj utils.obj version.obj mswindows.obj LIBFILES = @@ -89,3 +89,6 @@ $(BINNAME): $(OBJS) Makefile .c.obj: .AUTODEPEND $(CC) $(CFLAGS) $[@ +.c.i: .AUTODEPEND + $(CC) $(CFLAGS) -fo=$@ /Pc $[@ + -- 2.39.2