Update dependencies.

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index ea84c8a..6154002 100644 (file)
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -6,10 +6,9 @@
 
 CC = wcc386
 
-CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -s -fr=con -w2 -fpi -oilrtfm     &
-         -bt=nt -d+ -dWIN32 -dHAVE_STRTOLL                                  &
-         -dCURLDEBUG -dENABLE_IPV6 -dHAVE_WINSOCK2_H                        &
-         -I..\include -I..\lib
+CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -s -fr=con -w2 -fpi -oilrtfm &
+         -bt=nt -d+ -dWIN32 -dHAVE_STRTOLL -dCURLDEBUG -dENABLE_IPV6    &
+         -dHAVE_WINSOCK2_H -I..\include -I..\lib
 
 OBJ_DIR = WC_Win32.obj
 
@@ -51,39 +50,47 @@ $(RESOURCE): curl.rc
 #
 # Dependencies based on "gcc -MM .."
 #
-$(OBJ_DIR)\getpass.obj: getpass.c setup.h config-win32.h ..\lib\setup.h &
-  ..\lib\config-win32.h getpass.h ..\lib\memdebug.h ..\lib\setup.h &
-  ..\include\curl\curl.h ..\include\curl\curlver.h ..\include\curl\easy.h &
+$(OBJ_DIR)\getpass.obj: getpass.c setup.h config-win32.h ..\lib\setup_once.h getpass.h &
+  ..\lib\memdebug.h ..\lib\setup.h ..\lib\config-win32.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
+  ..\include\curl\curl.h ..\include\curl\curlver.h &
+  ..\include\curl\curlrules.h ..\include\curl\easy.h &
   ..\include\curl\multi.h ..\include\curl\curl.h
 
-$(OBJ_DIR)\homedir.obj: homedir.c setup.h config-win32.h ..\lib\setup.h &
-  ..\lib\config-win32.h homedir.h ..\lib\memdebug.h ..\lib\setup.h &
-  ..\include\curl\curl.h ..\include\curl\curlver.h ..\include\curl\easy.h &
+$(OBJ_DIR)\homedir.obj: homedir.c setup.h config-win32.h ..\lib\setup_once.h homedir.h &
+  ..\lib\memdebug.h ..\lib\setup.h ..\lib\config-win32.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
+  ..\include\curl\curl.h ..\include\curl\curlver.h &
+  ..\include\curl\curlrules.h ..\include\curl\easy.h &
   ..\include\curl\multi.h ..\include\curl\curl.h
 
-$(OBJ_DIR)\hugehelp.obj: hugehelp.c setup.h config-win32.h ..\lib\setup.h &
-  ..\lib\config-win32.h hugehelp.h
+$(OBJ_DIR)\hugehelp.obj: hugehelp.c
 
-$(OBJ_DIR)\main.obj: main.c setup.h config-win32.h ..\lib\setup.h &
-  ..\lib\config-win32.h ..\include\curl\curl.h ..\include\curl\curlver.h &
+$(OBJ_DIR)\main.obj: main.c setup.h config-win32.h ..\lib\setup_once.h &
+  ..\include\curl\curl.h ..\include\curl\curlver.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
   ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
-  urlglob.h writeout.h getpass.h homedir.h hugehelp.h version.h &
-  ..\include\curl\curlver.h ..\lib\curlx.h ..\include\curl\mprintf.h &
-  ..\lib\strequal.h ..\lib\strtoofft.h ..\lib\setup.h curlutil.h &
-  ..\lib\memdebug.h
-
-$(OBJ_DIR)\urlglob.obj: urlglob.c setup.h config-win32.h ..\lib\setup.h &
-  ..\lib\config-win32.h ..\include\curl\curl.h ..\include\curl\curlver.h &
+  urlglob.h writeout.h getpass.h homedir.h curlutil.h hugehelp.h &
+  version.h ..\include\curl\curlver.h ..\lib\curlx.h &
+  ..\include\curl\mprintf.h ..\lib\strequal.h ..\lib\strtoofft.h &
+  ..\lib\setup.h ..\lib\config-win32.h ..\include\curl\curlbuild.h &
+  ..\include\curl\curlrules.h ..\lib\timeval.h ..\lib\memdebug.h
+
+$(OBJ_DIR)\urlglob.obj: urlglob.c setup.h config-win32.h ..\lib\setup_once.h &
+  ..\include\curl\curl.h ..\include\curl\curlver.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
   ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
-  ..\include\curl\mprintf.h urlglob.h ..\lib\memdebug.h ..\lib\setup.h
+  ..\include\curl\mprintf.h urlglob.h ..\lib\memdebug.h ..\lib\setup.h &
+  ..\lib\config-win32.h ..\include\curl\curlbuild.h &
+  ..\include\curl\curlrules.h
 
-$(OBJ_DIR)\writeenv.obj: writeenv.c setup.h config-win32.h ..\lib\setup.h &
-  ..\lib\config-win32.h
+$(OBJ_DIR)\writeenv.obj: writeenv.c setup.h config-win32.h ..\lib\setup_once.h
 
-$(OBJ_DIR)\writeout.obj: writeout.c setup.h config-win32.h ..\lib\setup.h &
-  ..\lib\config-win32.h ..\include\curl\curl.h ..\include\curl\curlver.h &
+$(OBJ_DIR)\writeout.obj: writeout.c setup.h config-win32.h ..\lib\setup_once.h &
+  ..\include\curl\curl.h ..\include\curl\curlver.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
   ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
   ..\include\curl\mprintf.h writeout.h
 
-$(OBJ_DIR)\curlutil.obj: curlutil.c curlutil.h ..\lib\setup.h &
-  ..\lib\config-win32.h
+$(OBJ_DIR)\curlutil.obj: curlutil.c setup.h config-win32.h ..\lib\setup_once.h &
+  curlutil.h