[svn] Update Makefiles to work with the Watcom compiler.

Submitted by Csaba Raduly in
<OF3811C9F2.6A82D4BC-ON80256B27.005FC6F1@uk.sophos>.

diff --git a/ChangeLog b/ChangeLog
index e53e10fa9a6a5d750b098e2ad21f3b439d0234ae..ab21f978c312718959e39a9e65f1f20d3df49f2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-19  Csaba Raduly  <csaba.raduly@sophos.com>
+
+       * 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  <hniksic@arsdigita.com>
 
        * po/ja.po: Ditto.

diff --git a/configure.bat b/configure.bat
index 4d19629f816c99d3bb4e9c6613a1fe1fe768a3f1..9864659aec5ea362608c841656cbe2a0b5dcdf85 100644 (file)
--- 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 47e21c4bf40a8c48ec115859108bee9a88b10eb1..81811330a6edf71dee8eba20177766c5a04e2c39 100644 (file)
--- 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 $[@
+