Added nonblock.c to the non-automake makefiles (note that the dependencies

in the Watcom makefiles aren't quite correct).

diff --git a/CHANGES b/CHANGES
index 507cf7300f0303a392f0a0ae7f4e1c3dc810bccc..7ac0a48879fb185bf92ddff7b4e4fa1e47a92c80 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel Fandrich (15 Jul 2009)
+- Added nonblock.c to the non-automake makefiles (note that the dependencies
+  in the Watcom makefiles aren't quite correct).
+
 Michal Marek (15 Jul 2009)
 - Changed the description of CURLINFO_OS_ERRNO to make it clear that the
   errno is not reset on success.

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index cb7b8e96917c4e713e719313e9ac0e68f28653dd..1572c33cad5578f9e249fa61951477a55d055283 100644 (file)
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -69,7 +69,7 @@ OBJS = $(OBJ_DIR)\base64.obj           $(OBJ_DIR)\connect.obj        &
        $(OBJ_DIR)\telnet.obj           $(OBJ_DIR)\tftp.obj           &
        $(OBJ_DIR)\timeval.obj          $(OBJ_DIR)\transfer.obj       &
        $(OBJ_DIR)\url.obj              $(OBJ_DIR)\version.obj        &
-       $(OBJ_DIR)\slist.obj
+       $(OBJ_DIR)\slist.obj            $(OBJ_DIR)\nonblock.obj
 
 #
 # Use $(OBJS) as a template to generate $(OBJS_STAT) and $(OBJS_DYN).
@@ -525,6 +525,11 @@ $(OBJ_DIR)\nss.obj: nss.c setup.h config-win32.h ..\include\curl\curlbuild.h &
   url.h connect.h strequal.h select.h sslgen.h ..\include\curl\mprintf.h
 $(OBJ_DIR)\qssl.obj: qssl.c setup.h config-win32.h ..\include\curl\curlbuild.h &
   ..\include\curl\curlrules.h setup_once.h
+$(OBJ_DIR)\nonblock.obj: nonblock.c setup.h config-win32.h ..\include\curl\curlbuild.h &
+  ..\include\curl\curlrules.h setup_once.h nonblock.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)\rawstr.obj: rawstr.c setup.h config-win32.h ..\include\curl\curlbuild.h &
   ..\include\curl\curlrules.h setup_once.h rawstr.h &
   ..\include\curl\curl.h ..\include\curl\curlver.h &

diff --git a/lib/Makefile.riscos b/lib/Makefile.riscos
index 8d5c1beb1faf93fd3adeb000e9e680e85005e1d6..e34c97e672f8a03a3e3c447121b201f3ddeebcbf 100644 (file)
--- a/lib/Makefile.riscos
+++ b/lib/Makefile.riscos
@@ -13,7 +13,7 @@ objs =        o.base64 o.connect o.cookie o.dict \
        o.security o.select o.sendf o.speedcheck o.ssluse \
        o.strequal o.strtok o.telnet o.timeval \
        o.transfer o.url o.version o.strtoofft o.sslgen o.gtls \
-       o.rawstr o.curl_addrinfo o.slist
+       o.rawstr o.curl_addrinfo o.slist o.nonblock
 
 # Compile options:
 linkopts       = -o libcurl
@@ -135,6 +135,9 @@ o.sslgen:   c.sslgen
 o.ssluse:      c.ssluse
                gcc $(compileropts) -c -o ssluse.o c.ssluse
 
+o.nonblock:    c.nonblock
+               gcc $(compileropts) -c -o nonblock.o c.nonblock
+
 o.rawstr:      c.rawstr
                gcc $(compileropts) -c -o rawstr.o c.rawstr
 

diff --git a/lib/makefile.amiga b/lib/makefile.amiga
index d211d31e5d8b68fd65e1c847f1eaeb88141e4d85..d88707672a47072c425bbd298df2a8e22232de86 100644 (file)
--- a/lib/makefile.amiga
+++ b/lib/makefile.amiga
@@ -18,7 +18,7 @@ OBJS = amigaos.c base64.c connect.c content_encoding.c cookie.c dict.c easy.c \
        progress.c security.c select.c sendf.c share.c speedcheck.c ssluse.c  \
        strequal.c strtok.c telnet.c timeval.c transfer.c url.c version.c     \
        sslgen.c gtls.c strerror.c rawstr.c curl_addrinfo.c                   \
-       socks_gssapi.c socks_sspi.c curl_sspi.c slist.c
+       socks_gssapi.c socks_sspi.c curl_sspi.c slist.c nonblock.c
 
 all:   $(OBJS:.c=.o)
        ar cru libcurl.a $(OBJS:.c=.o)

diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp
index ae4537b12704511421c9421e2f118ed4b4a06317..b25013c332751fb963b3bb49b2575c38a9322fec 100644 (file)
--- a/packages/Symbian/group/curl.mmp
+++ b/packages/Symbian/group/curl.mmp
@@ -13,7 +13,7 @@ SOURCE \
 
 SOURCEPATH  ../../../lib
 SOURCE \
-    rawstr.c
+    rawstr.c nonblock.c
 
 USERINCLUDE ../../../src ../../../lib ../../../include/curl
 

diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 356106bb4db0a8382b87dafec10328e7423bc77d..e4995bad1cb62b9e5f6692ca09fe6066568abc9c 100644 (file)
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -31,7 +31,7 @@ SOURCE \
   hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c    \
   inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c   \
   strdup.c socks.c ssh.c nss.c qssl.c rawstr.c curl_addrinfo.c      \
-  socks_gssapi.c socks_sspi.c curl_sspi.c slist.c
+  socks_gssapi.c socks_sspi.c curl_sspi.c slist.c nonblock.c
 
 USERINCLUDE   ../../../lib ../../../include/curl
 #ifdef ENABLE_SSL

diff --git a/packages/TPF/curl.mak b/packages/TPF/curl.mak
index c865b391a9f23fc4b312ca6d318b217b7484c65d..7a45c2bb54fe73d701ef3b9cd389a1bb81fc0206 100644 (file)
--- a/packages/TPF/curl.mak
+++ b/packages/TPF/curl.mak
@@ -70,6 +70,7 @@ C_SRC += memdebug.c
 C_SRC += mprintf.c
 C_SRC += multi.c
 C_SRC += netrc.c
+C_SRC += nonblock.c
 C_SRC += nss.c
 C_SRC += parsedate.c
 C_SRC += progress.c

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 1853bcc6bd5f3c697326ba939c53f052497d0fa7..7d38c393af787c00428d96ad2b682d6be924cb20 100644 (file)
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -52,6 +52,10 @@ $(RESOURCE): curl.rc
 $(OBJ_DIR)\rawstr.obj: ..\lib\rawstr.c
        $(CC) $[@ $(CFLAGS) -fo=$@
 
+.ERASE
+$(OBJ_DIR)\nonblock.obj: ..\lib\nonblock.c
+       $(CC) $[@ $(CFLAGS) -fo=$@
+
 #
 # Dependencies based on "gcc -MM .."
 #
@@ -111,3 +115,11 @@ $(OBJ_DIR)\rawstr.obj: ..\lib\rawstr.c ..\lib\setup.h ..\lib\config-win32.h &
   ..\lib\strerror.h ..\lib\urldata.h ..\lib\cookie.h ..\lib\formdata.h &
   ..\lib\timeval.h ..\lib\http_chunks.h ..\lib\hostip.h ..\lib\hash.h &
   ..\lib\llist.h ..\lib\splay.h ..\include\curl\mprintf.h
+
+$(OBJ_DIR)\nonblock.obj: ..\lib\nonblock.c ..\lib\setup.h ..\lib\config-win32.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h ..\lib\setup_once.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 &
+  ..\lib\strerror.h ..\lib\urldata.h ..\lib\cookie.h ..\lib\formdata.h &
+  ..\lib\timeval.h ..\lib\http_chunks.h ..\lib\hostip.h ..\lib\hash.h &
+  ..\lib\llist.h ..\lib\splay.h ..\include\curl\mprintf.h ..\lib\nonblock.h

diff --git a/src/Makefile.riscos b/src/Makefile.riscos
index ad7dc6de5e9c01f675f6444c110c1c3a7916cf21..d0e13d212a4ea645679bc580ebea9a392e5bb7bd 100644 (file)
--- a/src/Makefile.riscos
+++ b/src/Makefile.riscos
@@ -4,7 +4,7 @@
 # Contact: easygcc@melotech.co.uk
 
 # Project objects:
-objs = o.hugehelp o.main o.urlglob o.writeout o.writeenv o.rawstr
+objs = o.hugehelp o.main o.urlglob o.writeout o.writeenv o.rawstr o.nonblock
        
 
 # Compile options:
@@ -37,6 +37,9 @@ o.writeenv:   c.writeenv
 o.rawstr:      ../lib/c.rawstr
                gcc $(compileropts) -c -o rawstr.o ../lib/c.rawstr
 
+o.nonblock:    ../lib/c.nonblock
+               gcc $(compileropts) -c -o nonblock.o ../lib/c.nonblock
+
 # Dynamic dependancies:
 o.hugehelp:    c.hugehelp
 

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index a3be9c232bc8fb9f0ac826e6a5c3ff3677d16e17..a906967c5ca4d9b13be8c159e9b2be10e776af62 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -99,6 +99,7 @@ RELEASE_OBJS= \
        homedirr.obj \\r
        curlutilr.obj \\r
        os-specificr.obj \\r
+       nonblockr.obj \\r
        rawstrr.obj \\r
        strtoofftr.obj \\r
        mainr.obj \\r
@@ -112,6 +113,7 @@ DEBUG_OBJS= \
        homedird.obj \\r
        curlutild.obj \\r
        os-specificd.obj \\r
+       nonblockd.obj \\r
        rawstrd.obj \\r
        strtoofftd.obj \\r
        maind.obj \\r
@@ -251,6 +253,8 @@ curlutilr.obj: curlutil.c
        $(CCR) $(CFLAGS) /Fo"$@" curlutil.c\r
 os-specificr.obj: os-specific.c\r
        $(CCR) $(CFLAGS) /Fo"$@" os-specific.c\r
+nonblockr.obj: ../lib/nonblock.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
 rawstrr.obj: ../lib/rawstr.c\r
        $(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c\r
 strtoofftr.obj: ../lib/strtoofft.c\r
@@ -275,6 +279,8 @@ curlutild.obj: curlutil.c
        $(CCD) $(CFLAGS) /Fo"$@" curlutil.c\r
 os-specificd.obj: os-specific.c\r
        $(CCD) $(CFLAGS) /Fo"$@" os-specific.c\r
+nonblockd.obj: ../lib/nonblock.c\r
+       $(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
 rawstrd.obj: ../lib/rawstr.c\r
        $(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c\r
 strtoofftd.obj: ../lib/strtoofft.c\r

diff --git a/src/makefile.amiga b/src/makefile.amiga
index c2371a6ccedcf283e42c65ed943ccaee76c62395..a242950f5a4658df66ff630a6673bed6d34e4b89 100644 (file)
--- a/src/makefile.amiga
+++ b/src/makefile.amiga
@@ -14,7 +14,7 @@ MANPAGE =     ../docs/curl.1
 README =       ../docs/MANUAL
 MKHELP =       ../src/mkhelp.pl
 
-OBJS   =       getpass.c hugehelp.c main.c urlglob.c writeenv.c writeout.c curlutil.c os-specific.c ../lib/rawstr.c
+OBJS   =       getpass.c hugehelp.c main.c urlglob.c writeenv.c writeout.c curlutil.c os-specific.c ../lib/rawstr.c ../lib/nonblock.c
 
 
 all:   hugehelp.c $(OBJS:.c=.o)

diff --git a/src/vc6curlsrc.dsp b/src/vc6curlsrc.dsp
index e888451dd6382506c7d13a7003e3d3c015472812..642cd5d3942a37d9a988f2e4dbb538f8cbbaa724 100644 (file)
--- a/src/vc6curlsrc.dsp
+++ b/src/vc6curlsrc.dsp
@@ -163,6 +163,10 @@ SOURCE=.\os-specific.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\lib\nonblock.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\lib\rawstr.c\r
 # End Source File\r
 # Begin Source File\r
@@ -215,6 +219,10 @@ SOURCE=.\setup.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\lib\nonblock.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\lib\rawstr.h\r
 # End Source File\r
 # Begin Source File\r