Remove slash/backslash problem, now only slashes are used,
Wmake automaticaly translate slash/backslash to proper version or tools a=
re not sensitive for it.
Enable spaces in path.
Use internal rm command for all host platforms
Add error message if old Open Watcom version is used. Some old versions e=
xhibit build problems for Curl latest version. Now only versions 1.8, 1.9=
 and 2.O beta are supported

---
 lib/Makefile.Watcom | 204 +++++++++++++++++++++++++---------------------=
-----
 src/Makefile.Watcom | 206 ++++++++++++++++++++++++++--------------------=
------
 2 files changed, 205 insertions(+), 205 deletions(-)
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index b775365..832ca01 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -3,16 +3,31 @@
 #  G. Vanem <gvanem_at_broadpark.no>
 #
=20
+.ERASE
+
+!if $(__VERSION__) < 1280
+!message !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=
!!!
+!message ! This Open Watcom version is too old and is no longer supporte=
d !
+!message !     Please download latest version from www.openwatcom.org   =
  !
+!message !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=
!!!
+!error Unsupported version of Open Watcom
+!endif
+
 !ifndef %watcom
 !error WATCOM environment variable not set!
 !endif
=20
+# In order to process Makefile.inc wmake must be called with -u switch!
+!ifndef %MAKEFLAGS
+!error You MUST call wmake with the -u switch!
+!endif
+
 !ifdef %libname
 LIBNAME =3D $(%libname)
 !else
 LIBNAME =3D libcurl
 !endif
-TARGETS =3D $(LIBNAME).dll $(LIBNAME)_imp.lib $(LIBNAME).lib
+TARGETS =3D $(LIBNAME).dll $(LIBNAME).lib
=20
 CC =3D wcc386
 LD =3D wlink
@@ -23,37 +38,29 @@ RC =3D wrc
 !  loaddll wcc386  wccd386
 !  loaddll wpp386  wppd386
 !  loaddll wlib    wlibd
-!  if $(__VERSION__) > 1270
-!    loaddll wlink   wlinkd
-!  else
-!    loaddll wlink   wlink
-!  endif
+!  loaddll wlink   wlinkd
 !endif
=20
 !ifdef __LINUX__
-DS =3D /
 CP =3D cp
 MD =3D mkdir -p
-RD =3D rmdir -p
-RM =3D rm -f
 !else
-DS =3D $(X)\$(X)
 CP =3D copy 2>NUL
 MD =3D mkdir
-RD =3D rmdir /q /s 2>NUL
-!if $(__VERSION__) < 1250
-RM =3D del /q /f 2>NUL
-!else
-RM =3D rm -f
 !endif
+!if $(__VERSION__) > 1290
+RD =3D rm -rf
+!else ifdef __UNIX__
+RD =3D rm -rf
+!else
+RD =3D rmdir /q /s 2>NUL
 !endif
=20
-SYS_INCL =3D -I$(%watcom)$(DS)h$(DS)nt -I$(%watcom)$(DS)h
-SYS_LIBS =3D $(%watcom)$(DS)lib386$(DS)nt;$(%watcom)$(DS)lib386
+SYS_INCL =3D -I"$(%watcom)/h/nt" -I"$(%watcom)/h"
=20
 CFLAGS =3D -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=3Dcon -w2 -fpi -oilr=
tfm &
          -wcd=3D201 -bt=3Dnt -d+ -dWIN32 -dCURL_WANTS_CA_BUNDLE_ENV     =
    &
-         -dBUILDING_LIBCURL -dHAVE_SPNEGO=3D1 -I. -I..$(DS)include $(SYS=
_INCL)
+         -dBUILDING_LIBCURL -dHAVE_SPNEGO=3D1 -I. -I"../include" $(SYS_I=
NCL)
=20
 !ifdef %debug
 DEBUG  =3D -dDEBUG=3D1 -dDEBUGBUILD
@@ -83,169 +90,162 @@ CFLAGS +=3D -dWANT_IDN_PROTOTYPES
 !ifdef %zlib_root
 ZLIB_ROOT =3D $(%zlib_root)
 !else
-ZLIB_ROOT =3D ..$(DS)..$(DS)zlib-1.2.8
+ZLIB_ROOT =3D ../../zlib-1.2.8
 !endif
=20
 !ifdef %libssh2_root
 LIBSSH2_ROOT =3D $(%libssh2_root)
 !else
-LIBSSH2_ROOT =3D ..$(DS)..$(DS)libssh2-1.4.3
+LIBSSH2_ROOT =3D ../../libssh2-1.4.3
 !endif
=20
 !ifdef %librtmp_root
 LIBRTMP_ROOT =3D $(%librtmp_root)
 !else
-LIBRTMP_ROOT =3D ..$(DS)..$(DS)rtmpdump-2.3
+LIBRTMP_ROOT =3D ../../rtmpdump-2.3
 !endif
=20
 !ifdef %openssl_root
 OPENSSL_ROOT =3D $(%openssl_root)
 !else
-OPENSSL_ROOT =3D ..$(DS)..$(DS)openssl-0.9.8y
+OPENSSL_ROOT =3D ../../openssl-0.9.8y
 !endif
=20
 !ifdef %ares_root
 ARES_ROOT =3D $(%ares_root)
 !else
-ARES_ROOT =3D ..$(DS)ares
+ARES_ROOT =3D ../ares
 !endif
=20
 !ifdef %use_zlib
-CFLAGS +=3D -dHAVE_ZLIB_H -dHAVE_LIBZ -I$(ZLIB_ROOT)
+CFLAGS +=3D -dHAVE_ZLIB_H -dHAVE_LIBZ -I"$(ZLIB_ROOT)"
 !endif
=20
 !ifdef %use_rtmp
-CFLAGS +=3D -dUSE_LIBRTMP -I$(LIBRTMP_ROOT)
+CFLAGS +=3D -dUSE_LIBRTMP -I"$(LIBRTMP_ROOT)"
 !endif
=20
 !ifdef %use_ssh2
-CFLAGS +=3D -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H -I$(LIBSSH2_ROOT)$(DS)include=
 -I$(LIBSSH2_ROOT)$(DS)win32
+CFLAGS +=3D -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H -I"$(LIBSSH2_ROOT)/include" -=
I"$(LIBSSH2_ROOT)/win32"
 !endif
=20
 !ifdef %use_ssl
-CFLAGS +=3D -wcd=3D138 -dUSE_OPENSSL -dUSE_SSLEAY -I$(OPENSSL_ROOT)$(DS)=
inc32
+CFLAGS +=3D -wcd=3D138 -dUSE_OPENSSL -dUSE_SSLEAY -I"$(OPENSSL_ROOT)/inc=
32"
 !endif
=20
 !ifdef %use_ares
-CFLAGS +=3D -dUSE_ARES -I$(ARES_ROOT)
+CFLAGS +=3D -dUSE_ARES -I"$(ARES_ROOT)"
 !endif
=20
 !ifdef %use_watt32
-CFLAGS +=3D -dUSE_WATT32 -I$(%watt_root)$(DS)inc
+CFLAGS +=3D -dUSE_WATT32 -I"$(%watt_root)/inc"
 !endif
=20
 OBJ_BASE =3D WC_Win32.obj
-LINK_ARG =3D $(OBJ_BASE)$(DS)dyn$(DS)wlink.arg
-LIB_ARG  =3D $(OBJ_BASE)$(DS)stat$(DS)wlib.arg
-
-# In order to process Makefile.inc wmake must be called with -u switch!
-!ifndef %MAKEFLAGS
-!error You MUST call wmake with the -u switch!
+!if $(__VERSION__) > 1290
+OBJ_STAT =3D $(OBJ_BASE)/stat
+OBJ_DYN  =3D $(OBJ_BASE)/dyn
+!else ifdef __UNIX__
+OBJ_STAT =3D $(OBJ_BASE)/stat
+OBJ_DYN  =3D $(OBJ_BASE)/dyn
 !else
-!include Makefile.inc
+OBJ_STAT =3D $(OBJ_BASE)\stat
+OBJ_DYN  =3D $(OBJ_BASE)\dyn
 !endif
=20
-OBJS =3D $(CSOURCES:.c=3D.obj)
-!ifdef __LINUX__
-OBJS =3D $OBJ_DIR/$(OBJS: =3D $OBJ_DIR/)
+LINK_ARG =3D $(OBJ_DYN)/wlink.arg
+LIB_ARG  =3D $(OBJ_STAT)/wlib.arg
=20
-!else
-OBJS =3D $OBJ_DIR\$(OBJS: =3D $OBJ_DIR\)
-!endif
+!include Makefile.inc
=20
-#
-# Use $(OBJS) as a template to generate $(OBJS_STAT) and $(OBJS_DYN).
-#
-OBJ_DIR    =3D $(OBJ_BASE)$(DS)stat
-OBJS_STAT  =3D $+ $(OBJS) $-
+OBJS1 =3D ./$(CSOURCES:.c=3D.obj)
+OBJS2 =3D $(OBJS1:vtls/=3D)
+OBJS3 =3D $(OBJS2: =3D ./)
+OBJS_STAT =3D $(OBJS3:./=3D$(OBJ_STAT)/)
+OBJS_DYN  =3D $(OBJS3:./=3D$(OBJ_DYN)/)
+
+CURLBUILDH =3D ../include/curl/curlbuild.h
+RESOURCE   =3D $(OBJ_DYN)/libcurl.res
=20
-OBJ_DIR    =3D $(OBJ_BASE)$(DS)dyn
-OBJS_DYN   =3D $+ $(OBJS) $-
+DIRS =3D $(OBJ_BASE) $(OBJ_BASE)/stat $(OBJ_BASE)/dyn
=20
-CURLBUILDH =3D ..$(DS)include$(DS)curl$(DS)curlbuild.h
-RESOURCE   =3D $(OBJ_BASE)$(DS)dyn$(DS)libcurl.res
+.c : vtls
=20
-all: $(CURLBUILDH) $(OBJ_BASE) $(TARGETS) .SYMBOLIC
+all: $(CURLBUILDH) $(DIRS) $(TARGETS) .SYMBOLIC
 	@echo Welcome to libcurl
=20
 clean: .SYMBOLIC
-	-$(RM) $(OBJS_STAT)
-	-$(RM) $(OBJS_DYN)
-	-$(RM) $(RESOURCE) $(LINK_ARG) $(LIB_ARG)
+	-rm -f $(OBJS_STAT)
+	-rm -f $(OBJS_DYN)
+	-rm -f $(RESOURCE) $(LINK_ARG) $(LIB_ARG)
=20
 vclean distclean: clean .SYMBOLIC
-	-$(RM) $(TARGETS) $(LIBNAME).map $(LIBNAME).sym
-	-$(RD) $(OBJ_BASE)$(DS)stat
-	-$(RD) $(OBJ_BASE)$(DS)dyn
+	-rm -f $(TARGETS) $(LIBNAME).map $(LIBNAME).sym
+	-$(RD) $(OBJ_STAT)
+	-$(RD) $(OBJ_DYN)
 	-$(RD) $(OBJ_BASE)
=20
-$(OBJ_BASE):
+$(DIRS):
 	-$(MD) $^@
-	-$(MD) $^@$(DS)stat
-	-$(MD) $^@$(DS)dyn
=20
 $(CURLBUILDH): .EXISTSONLY
 	$(CP) $^@.dist $^@
=20
-$(LIBNAME).dll: $(OBJS_DYN) $(RESOURCE) $(LINK_ARG)
-	$(LD) name $^@ @$]@
-
-$(LIBNAME).lib: $(OBJS_STAT) $(LIB_ARG)
-	$(AR) -q -b -c $^@ @$]@
-
-.ERASE
-$(RESOURCE): libcurl.rc
-	$(RC) $(DEBUG) -q -r -zm -bt=3Dnt -I..$(DS)include $(SYS_INCL) $[@ -fo=3D=
$^@
-
-.ERASE
-.c{$(OBJ_BASE)$(DS)dyn}.obj:
-	$(CC) $(CFLAGS) -bd -br $[@ -fo=3D$^@
-
-.ERASE
-.c{$(OBJ_BASE)$(DS)stat}.obj:
-	$(CC) $(CFLAGS) -DCURL_STATICLIB $[@ -fo=3D$^@
-
-$(LINK_ARG): $(__MAKEFILES__)
-	%create $^@
-	@%append $^@ system nt dll
-	@%append $^@ file { $(OBJS_DYN) }
+$(LIBNAME).dll: $(OBJS_DYN) $(RESOURCE) $(__MAKEFILES__)
+	%create $(LINK_ARG)
+	@%append $(LINK_ARG) system nt dll
 !ifdef %debug
-	@%append $^@ debug all
-	@%append $^@ option symfile
-!endif
-	@%append $^@ option quiet, map, caseexact, eliminate, implib=3D$(LIBNAM=
E)_imp.lib,
-	@%append $^@ res=3D$(RESOURCE) libpath $(SYS_LIBS)
-	@%append $^@ library wldap32.lib
+	@%append $(LINK_ARG) debug all
+	@%append $(LINK_ARG) option symfile
+!endif
+	@%append $(LINK_ARG) option quiet, caseexact, eliminate
+	@%append $(LINK_ARG) option map=3D$(OBJ_DYN)/$(LIBNAME).map
+	@%append $(LINK_ARG) option implib=3D$(LIBNAME)_imp.lib
+	@%append $(LINK_ARG) option res=3D$(RESOURCE)
+	@for %f in ($(OBJS_DYN)) do @%append $(LINK_ARG) file %f
+	@%append $(LINK_ARG) library wldap32.lib
 !ifdef %use_watt32
-	@%append $^@ library $(%watt_root)$(DS)lib$(DS)wattcpw_imp.lib
+	@%append $(LINK_ARG) library '$(%watt_root)/lib/wattcpw_imp.lib'
 !else
-	@%append $^@ library ws2_32.lib
+	@%append $(LINK_ARG) library ws2_32.lib
 !endif
 !ifdef %use_zlib
-	@%append $^@ library $(ZLIB_ROOT)$(DS)zlib.lib
+	@%append $(LINK_ARG) library '$(ZLIB_ROOT)/zlib.lib'
 !endif
 !ifdef %use_rtmp
-	@%append $^@ library $(LIBRTMP_ROOT)$(DS)librtmp$(DS)librtmp.lib
+	@%append $(LINK_ARG) library '$(LIBRTMP_ROOT)/librtmp/librtmp.lib'
 !endif
 !ifdef %use_ssh2
-	@%append $^@ library $(LIBSSH2_ROOT)$(DS)win32$(DS)libssh2.lib
+	@%append $(LINK_ARG) library '$(LIBSSH2_ROOT)/win32/libssh2.lib'
 !endif
 !ifdef %use_ssl
-	@%append $^@ library $(OPENSSL_ROOT)$(DS)out32$(DS)libeay32.lib, $(OPEN=
SSL_ROOT)$(DS)out32$(DS)ssleay32.lib
+	@%append $(LINK_ARG) library '$(OPENSSL_ROOT)/out32/libeay32.lib'
+	@%append $(LINK_ARG) library '$(OPENSSL_ROOT)/out32/ssleay32.lib'
 !endif
 !ifdef %use_ares
-	@%append $^@ library $(ARES_ROOT)$(DS)cares.lib
+	@%append $(LINK_ARG) library '$(ARES_ROOT)/cares.lib'
 !endif
 !ifdef %use_winidn
 !  if $(__VERSION__) > 1290
-	@%append $^@ library normaliz.lib
+	@%append $(LINK_ARG) library normaliz.lib
 !  else
-	@%append $^@ import '_IdnToAscii_at_20' 'NORMALIZ.DLL'.'IdnToAscii'
-	@%append $^@ import '_IdnToUnicode_at_20' 'NORMALIZ.DLL'.'IdnToUnicode'
+	@%append $(LINK_ARG) import '_IdnToAscii_at_20' 'NORMALIZ.DLL'.'IdnToAscii=
'
+	@%append $(LINK_ARG) import '_IdnToUnicode_at_20' 'NORMALIZ.DLL'.'IdnToUni=
code'
 !  endif
 !endif
+	$(LD) name $^@ @$(LINK_ARG)
=20
-$(LIB_ARG): $(__MAKEFILES__)
-	%create $^@
-	@for %f in ($(OBJS_STAT)) do @%append $^@ +- %f
+$(LIBNAME).lib: $(OBJS_STAT)
+	%create $(LIB_ARG)
+	@for %f in ($<) do @%append $(LIB_ARG) +- %f
+	$(AR) -q -b -c -pa $^@ @$(LIB_ARG)
=20
+$(RESOURCE): libcurl.rc
+	$(RC) $(DEBUG) -q -r -zm -bt=3Dnt -I"../include" $(SYS_INCL) $[@ -fo=3D=
$^@
+
+.c{$(OBJ_DYN)}.obj:
+	$(CC) $(CFLAGS) -bd -br $[@ -fo=3D$^@
+
+.c{$(OBJ_STAT)}.obj:
+	$(CC) $(CFLAGS) -DCURL_STATICLIB $[@ -fo=3D$^@
+=09
\ No newline at end of file
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 6b3103a..b0c6566 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -3,16 +3,32 @@
 #  G. Vanem <gvanem_at_broadpark.no>
 #
=20
+.ERASE
+
+!if $(__VERSION__) < 1280
+!message !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=
!!!
+!message ! This Open Watcom version is too old and is no longer supporte=
d !
+!message !     Please download latest version from www.openwatcom.org   =
  !
+!message !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=
!!!
+!error Unsupported version of Open Watcom
+!endif
+
 !ifndef %watcom
 !error WATCOM environment variable not set!
 !endif
=20
+# In order to process Makefile.inc wmake must be called with -u switch!
+!ifndef %MAKEFLAGS
+!error You MUST call wmake with the -u switch!
+!endif
+
 !ifdef %libname
 LIBNAME =3D $(%libname)
 !else
 LIBNAME =3D libcurl
 !endif
-TARGETS =3D $(LIBNAME).dll $(LIBNAME)_imp.lib $(LIBNAME).lib
+
+TARGETS =3D curl.exe
=20
 CC =3D wcc386
 LD =3D wlink
@@ -23,37 +39,29 @@ RC =3D wrc
 !  loaddll wcc386  wccd386
 !  loaddll wpp386  wppd386
 !  loaddll wlib    wlibd
-!  if $(__VERSION__) > 1270
-!    loaddll wlink   wlinkd
-!  else
-!    loaddll wlink   wlink
-!  endif
+!  loaddll wlink   wlinkd
 !endif
=20
-!ifdef __LINUX__
-DS =3D /
+!ifdef __UNIX__
 CP =3D cp
 MD =3D mkdir -p
-RD =3D rmdir -p
-RM =3D rm -f
 !else
-DS =3D $(X)\$(X)
 CP =3D copy 2>NUL
 MD =3D mkdir
-RD =3D rmdir /q /s 2>NUL
-!if $(__VERSION__) < 1250
-RM =3D del /q /f 2>NUL
-!else
-RM =3D rm -f
 !endif
+!if $(__VERSION__) > 1290
+RD =3D rm -rf
+!else ifdef __UNIX__
+RD =3D rm -rf
+!else
+RD =3D rmdir /q /s 2>NUL
 !endif
=20
-SYS_INCL =3D -I$(%watcom)$(DS)h$(DS)nt -I$(%watcom)$(DS)h
-SYS_LIBS =3D $(%watcom)$(DS)lib386$(DS)nt;$(%watcom)$(DS)lib386
+SYS_INCL =3D -I"$(%watcom)/h/nt" -I"$(%watcom)/h"
=20
 CFLAGS =3D -3r -mf -hc -zff -zgf -zq -zm -s -fr=3Dcon -w2 -fpi -oilrtfm =
&
          -wcd=3D201 -bt=3Dnt -bc -d+ -dWIN32 -dHAVE_STRTOLL             =
&
-         -I..$(DS)include -I..$(DS)lib $(SYS_INCL)
+         -I"../include" -I"../lib" $(SYS_INCL)
=20
 !ifdef %debug
 DEBUG  =3D -dDEBUG=3D1 -dDEBUGBUILD
@@ -66,82 +74,75 @@ CFLAGS +=3D -d0
 CFLAGS +=3D -d_WIN32_WINNT=3D0x0501 -dENABLE_IPV6
 !endif
=20
+!ifdef %use_ssl
+CFLAGS +=3D -wcd=3D138 -dUSE_OPENSSL -dUSE_SSLEAY -I"$(OPENSSL_ROOT)/inc=
32"
+!endif
+
+!ifdef %curl_static
+CFLAGS +=3D -DCURL_STATICLIB
+!else
+CFLAGS +=3D -br
+!endif
+
 #
 # Change to suite.
 #
 !ifdef %zlib_root
 ZLIB_ROOT =3D $(%zlib_root)
 !else
-ZLIB_ROOT =3D ..$(DS)..$(DS)zlib-1.2.8
+ZLIB_ROOT =3D ../../zlib-1.2.8
 !endif
=20
 !ifdef %libssh2_root
 LIBSSH2_ROOT =3D $(%libssh2_root)
 !else
-LIBSSH2_ROOT =3D ..$(DS)..$(DS)libssh2-1.4.3
+LIBSSH2_ROOT =3D ../../libssh2-1.4.3
 !endif
=20
 !ifdef %librtmp_root
 LIBRTMP_ROOT =3D $(%librtmp_root)
 !else
-LIBRTMP_ROOT =3D ..$(DS)..$(DS)rtmpdump-2.3
+LIBRTMP_ROOT =3D ../../rtmpdump-2.3
 !endif
=20
 !ifdef %openssl_root
 OPENSSL_ROOT =3D $(%openssl_root)
 !else
-OPENSSL_ROOT =3D ..$(DS)..$(DS)openssl-0.9.8y
+OPENSSL_ROOT =3D ../../openssl-0.9.8y
 !endif
=20
 !ifdef %ares_root
 ARES_ROOT =3D $(%ares_root)
 !else
-ARES_ROOT =3D ..$(DS)ares
-!endif
-
-!ifdef %use_ssl
-CFLAGS +=3D -wcd=3D138 -dUSE_OPENSSL -dUSE_SSLEAY -I$(OPENSSL_ROOT)$(DS)=
inc32
+ARES_ROOT =3D ../ares
 !endif
=20
 OBJ_DIR  =3D WC_Win32.obj
-LINK_ARG =3D $(OBJ_DIR)$(DS)wlink.arg
+LINK_ARG =3D $(OBJ_DIR)/wlink.arg
=20
-# In order to process Makefile.inc wmake must be called with -u switch!
-!ifndef %MAKEFLAGS
-!error You MUST call wmake with the -u switch!
-!else
 !include Makefile.inc
-!endif
-# For now we still define the CURLX_ONES sources here unless we know how
-# to split off the prefixed path.
-CURLX_SOURCES =3D rawstr.c nonblock.c
=20
-OBJS =3D $(CURL_CFILES:.c=3D.obj)
-!ifdef %curl_static
-CFLAGS +=3D -DCURL_STATICLIB
-!else
-CFLAGS +=3D -br
-OBJS +=3D $(CURLX_SOURCES:.c=3D.obj)
+OBJS1 =3D $(OBJ_DIR)/$(CURL_CFILES)
+!ifndef %curl_static
+OBJS1 +=3D $(CURLX_ONES:../lib/=3D)
 !endif
-!ifdef __LINUX__
-OBJS =3D $OBJ_DIR/$(OBJS: =3D $OBJ_DIR/)
+OBJS2 =3D $(OBJS1: =3D $(OBJ_DIR)/)
+OBJS =3D $(OBJS2:.c=3D.obj)
=20
-!else
-OBJS =3D $OBJ_DIR\$(OBJS: =3D $OBJ_DIR\)
-!endif
+RESOURCE =3D $(OBJ_DIR)/curl.res
=20
-RESOURCE =3D $(OBJ_DIR)$(DS)curl.res
+DIRS =3D $(OBJ_DIR)
=20
-all: tool_hugehelp.c $(OBJ_DIR) curl.exe .SYMBOLIC
+all: tool_hugehelp.c $(DIRS) $(TARGETS) .SYMBOLIC
 	@echo Welcome to cURL
=20
 clean: .SYMBOLIC
-	-$(RM) $(OBJS)
-	-$(RM) $(RESOURCE) $(LINK_ARG)
+	-rm -f $(OBJS)
+	-rm -f $(RESOURCE) $(LINK_ARG)
=20
 vclean distclean: clean .SYMBOLIC
 	-$(RD) $(OBJ_DIR)
-	-$(RM) curl.exe curl.map curl.sym tool_hugehelp.c
+	-rm -f curl.exe curl.sym tool_hugehelp.c
=20
 tool_hugehelp.c: tool_hugehelp.c.cvs
 	$(CP) $[@ $^@
@@ -149,64 +150,63 @@ tool_hugehelp.c: tool_hugehelp.c.cvs
 tool_hugehelp.c.cvs: .EXISTSONLY
 	$(CP) tool_hugehelp.c $^@
=20
-$(OBJ_DIR):
+$(DIRS):
 	-$(MD) $^@
=20
-curl.exe: $(OBJS) $(RESOURCE) $(LINK_ARG)
-	$(LD) name $^@ @$]@
-
-$(RESOURCE): curl.rc
-	$(RC) $(DEBUG) -q -r -zm -bt=3Dnt -I..$(DS)include $(SYS_INCL) $[@ -fo=3D=
$^@
-
-# suffix search path - vpath-like hack
-.c: ..$(DS)lib
-
-.ERASE
-.c{$(OBJ_DIR)}.obj:
-	$(CC) $(CFLAGS) $[@ -fo=3D$^@
-
-$(LINK_ARG): $(__MAKEFILES__)
-	%create $^@
-	@%append $^@ system nt
-	@%append $^@ file { $(OBJS) }
+curl.exe: $(OBJS) $(RESOURCE)
+	%create $(LINK_ARG)
+	@%append $(LINK_ARG) system nt
 !ifdef %debug
-	@%append $^@ debug all
-	@%append $^@ option symfile
-!endif
-	@%append $^@ option quiet, map, caseexact, eliminate,
-	@%append $^@ res=3D$(RESOURCE) libpath $(SYS_LIBS)
-!ifdef %curl_static
-	@%append $^@ library wldap32.lib
-	@%append $^@ library ..$(DS)lib$(DS)$(LIBNAME).lib
-!ifdef %use_zlib
-	@%append $^@ library $(ZLIB_ROOT)$(DS)zlib.lib
-!endif
-!ifdef %use_rtmp
-	@%append $^@ library $(LIBRTMP_ROOT)$(DS)librtmp$(DS)librtmp.lib, winmm=
.lib
-!endif
-!ifdef %use_ssh2
-	@%append $^@ library $(LIBSSH2_ROOT)$(DS)win32$(DS)libssh2.lib
-!endif
-!ifdef %use_ssl
-	@%append $^@ library $(OPENSSL_ROOT)$(DS)out32$(DS)libeay32.lib, $(OPEN=
SSL_ROOT)$(DS)out32$(DS)ssleay32.lib
-!endif
-!ifdef %use_ares
-	@%append $^@ library $(ARES_ROOT)$(DS)cares.lib
-!endif
-!ifdef %use_winidn
+	@%append $(LINK_ARG) debug all
+	@%append $(LINK_ARG) option symfile
+!endif
+	@%append $(LINK_ARG) option quiet, caseexact, eliminate
+	@%append $(LINK_ARG) option map=3D$(OBJ_DIR)/$^&.map
+	@%append $(LINK_ARG) option res=3D$(RESOURCE)
+	@%append $(LINK_ARG) file { $(OBJS) }
+!ifndef %curl_static
+	@%append $(LINK_ARG) library ../lib/$(LIBNAME)_imp.lib
+!else
+	@%append $(LINK_ARG) library ../lib/$(LIBNAME).lib
+	@%append $(LINK_ARG) library wldap32.lib
+! ifdef %use_zlib
+	@%append $(LINK_ARG) library '$(ZLIB_ROOT)/zlib.lib'
+! endif
+! ifdef %use_rtmp
+	@%append $(LINK_ARG) library '$(LIBRTMP_ROOT)/librtmp/librtmp.lib'
+	@%append $(LINK_ARG) library winmm.lib
+! endif
+! ifdef %use_ssh2
+	@%append $(LINK_ARG) library '$(LIBSSH2_ROOT)/win32/libssh2.lib'
+! endif
+! ifdef %use_ssl
+	@%append $(LINK_ARG) library '$(OPENSSL_ROOT)/out32/libeay32.lib'
+	@%append $(LINK_ARG) library '$(OPENSSL_ROOT)/out32/ssleay32.lib'
+! endif
+! ifdef %use_ares
+	@%append $(LINK_ARG) library '$(ARES_ROOT)/cares.lib'
+! endif
+! ifdef %use_winidn
 !  if $(__VERSION__) > 1290
-	@%append $^@ library normaliz.lib
+	@%append $(LINK_ARG) library normaliz.lib
 !  else
-	@%append $^@ import '_IdnToAscii_at_20' 'NORMALIZ.DLL'.'IdnToAscii'
-	@%append $^@ import '_IdnToUnicode_at_20' 'NORMALIZ.DLL'.'IdnToUnicode'
+	@%append $(LINK_ARG) import '_IdnToAscii_at_20' 'NORMALIZ.DLL'.'IdnToAscii=
'
+	@%append $(LINK_ARG) import '_IdnToUnicode_at_20' 'NORMALIZ.DLL'.'IdnToUni=
code'
 !  endif
-!endif
-!else
-	@%append $^@ library ..$(DS)lib$(DS)$(LIBNAME)_imp.lib
+! endif
 !endif
 !ifeq USE_WATT32 1
-	@%append $^@ library $(%watt_root)$(DS)lib$(DS)wattcpw_imp.lib
+	@%append $(LINK_ARG) library '$(%watt_root)/lib/wattcpw_imp.lib'
 !else
-	@%append $^@ library ws2_32.lib
+	@%append $(LINK_ARG) library ws2_32.lib
 !endif
+	$(LD) name $^@ @$(LINK_ARG)
+
+$(RESOURCE): curl.rc
+	$(RC) $(DEBUG) -q -r -zm -bt=3Dnt -I"../include" $(SYS_INCL) $[@ -fo=3D=
$^@
=20
+# suffix search path - vpath-like hack
+.c: ../lib
+
+.c{$(OBJ_DIR)}.obj:
+	$(CC) $(CFLAGS) $[@ -fo=3D$^@
--=20
1.8.1.4
------=_20140303003311_61607
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette:  http://curl.haxx.se/mail/etiquette.html
------=_20140303003311_61607--