From b74b5e0602b26e8eec004b09d455b2ff0dbaffa1 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Wed, 15 Jul 2009 21:49:47 +0000
Subject: Added nonblock.c to the non-automake makefiles (note that the
 dependencies in the Watcom makefiles aren't quite correct).

---
 src/Makefile.Watcom | 12 ++++++++++++
 src/Makefile.riscos |  5 ++++-
 src/Makefile.vc6    |  6 ++++++
 src/makefile.amiga  |  2 +-
 src/vc6curlsrc.dsp  |  8 ++++++++
 5 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 1853bcc6b..7d38c393a 100644
--- 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 ad7dc6de5..d0e13d212 100644
--- 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 a3be9c232..a906967c5 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -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
diff --git a/src/makefile.amiga b/src/makefile.amiga
index c2371a6cc..a242950f5 100644
--- 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 e888451dd..642cd5d39 100644
--- a/src/vc6curlsrc.dsp
+++ b/src/vc6curlsrc.dsp
@@ -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
-- 
cgit v1.2.3