moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

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

Browse Source 
in the Watcom makefiles aren't quite correct).
This commit is contained in:
Dan Fandrich 2009-07-15 21:49:47 +00:00
parent b4dcbbfabd
commit b74b5e0602
12 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -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.

7
lib/Makefile.Watcom
View File

@ -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 &

5
lib/Makefile.riscos
View File

@ -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

2
lib/makefile.amiga
View File

@ -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)

2
packages/Symbian/group/curl.mmp
View File

@ -13,7 +13,7 @@ SOURCE \
SOURCEPATH ../../../lib
SOURCE \
rawstr.c
rawstr.c nonblock.c
USERINCLUDE ../../../src ../../../lib ../../../include/curl

2
packages/Symbian/group/libcurl.mmp
View File

@ -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

1
packages/TPF/curl.mak
View File

@ -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

12
src/Makefile.Watcom
View File

@ -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

5
src/Makefile.riscos
View File

@ -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

6
src/Makefile.vc6
View File

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

2
src/makefile.amiga
View File

@ -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)

8
src/vc6curlsrc.dsp
View File

@ -163,6 +163,10 @@ SOURCE=.\os-specific.c
# End Source File
# Begin Source File
SOURCE=..\lib\nonblock.c
# End Source File
# Begin Source File
SOURCE=..\lib\rawstr.c
# End Source File
# Begin Source File
@ -215,6 +219,10 @@ SOURCE=.\setup.h
# End Source File
# Begin Source File
SOURCE=..\lib\nonblock.h
# End Source File
# Begin Source File
SOURCE=..\lib\rawstr.h
# End Source File
# Begin Source File