Commit b74b5e06 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

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

in the Watcom makefiles aren't quite correct).
parent b4dcbbfa

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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.

lib/Makefile.Watcom

+6 −1
Original line number Diff line number Diff line
@@ -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 &

lib/Makefile.riscos

+4 −1
Original line number Diff line number Diff line
@@ -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

lib/makefile.amiga

+1 −1
Original line number Diff line number Diff line
@@ -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)

packages/Symbian/group/curl.mmp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ SOURCE \ 


SOURCEPATH  ../../../lib

SOURCE \

    rawstr.c

    rawstr.c nonblock.c



USERINCLUDE ../../../src ../../../lib ../../../include/curl