Added the new protocol source files to the non-autoconf build files

6 files changed, 52 insertions, 4 deletions

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 306d876b5..b958e7da1 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -39,6 +39,8 @@ C_ARG    = $(OBJ_BASE)\wcc386.arg
 LINK_ARG = $(OBJ_BASE)\dyn\wlink.arg
 LIB_ARG  = $(OBJ_BASE)\stat\wlib.arg
 
+# Unfortunately, we can't include Makefile.inc here because wmake doesn't
+# use backslash as the line continuation character by default
 OBJS = $(OBJ_DIR)\base64.obj           $(OBJ_DIR)\connect.obj        &
        $(OBJ_DIR)\content_encoding.obj $(OBJ_DIR)\cookie.obj         &
        $(OBJ_DIR)\curl_addrinfo.obj    $(OBJ_DIR)\dict.obj           &
@@ -70,7 +72,9 @@ OBJS = $(OBJ_DIR)\base64.obj           $(OBJ_DIR)\connect.obj        &
        $(OBJ_DIR)\timeval.obj          $(OBJ_DIR)\transfer.obj       &
        $(OBJ_DIR)\url.obj              $(OBJ_DIR)\version.obj        &
        $(OBJ_DIR)\slist.obj            $(OBJ_DIR)\nonblock.obj       &
-       $(OBJ_DIR)\curl_rand.obj        $(OBJ_DIR)\curl_memrchr.obj
+       $(OBJ_DIR)\curl_rand.obj        $(OBJ_DIR)\curl_memrchr.obj   &
+       $(OBJ_DIR)\imap.obj             $(OBJ_DIR)\pop3.obj           &
+       $(OBJ_DIR)\smtp.obj             $(OBJ_DIR)\pingpong.obj
 
 #
 # Use $(OBJS) as a template to generate $(OBJS_STAT) and $(OBJS_DYN).
@@ -554,3 +558,27 @@ $(OBJ_DIR)\curl_memrchr.obj: curl_memrchr.c setup.h config-win32.h &
   ..\include\curl\curlrules.h ..\include\curl\easy.h &
   ..\include\curl\multi.h ..\include\curl\curl.h curl_memrchr.h &
   ..\include\curl\mprintf.h curl_memory.h memdebug.h
+$(OBJ_DIR)\imap.obj: imap.c setup.h config-win32.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h 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 imap.h &
+  ..\include\curl\mprintf.h curl_memory.h memdebug.h
+$(OBJ_DIR)\pop3.obj: pop3.c setup.h config-win32.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h 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 pop3.h &
+  ..\include\curl\mprintf.h curl_memory.h memdebug.h
+$(OBJ_DIR)\smtp.obj: smtp.c setup.h config-win32.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h 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 smtp.h &
+  ..\include\curl\mprintf.h curl_memory.h memdebug.h
+$(OBJ_DIR)\pingpong.obj: pingpong.c setup.h config-win32.h &
+  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h 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 pingpong.h &
+  ..\include\curl\mprintf.h curl_memory.h memdebug.h
diff --git a/lib/Makefile.riscos b/lib/Makefile.riscos
index 8eaa8ee47..dd95a2c00 100644
--- a/lib/Makefile.riscos
+++ b/lib/Makefile.riscos
@@ -14,7 +14,7 @@ objs =	o.base64 o.connect o.cookie o.dict \
 	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.nonblock o.curl_rand \
-	o.curl_memrchr
+	o.curl_memrchr o.imap o.pop3 o.smtp o.pingpong
 
 
 # Compile options:
@@ -92,6 +92,9 @@ o.http_chunks:	c.http_chunks
 o.if2ip:	c.if2ip
 		gcc $(compileropts) -c -o if2ip.o c.if2ip
 
+o.imap:		c.imap
+		gcc $(compileropts) -c -o imap.o c.imap
+
 o.inet_ntop:	c.inet_ntop
 		gcc $(compileropts) -c -o inet_ntop.o c.inet_ntop
 
@@ -116,6 +119,12 @@ o.netrc:	c.netrc
 o.parsedate:	c.parsedate
 		gcc $(compileropts) -c -o parsedate.o c.parsedate
 
+o.pingpong:	c.pingpong
+		gcc $(compileropts) -c -o pingpong.o c.pingpong
+
+o.pop3:		c.pop3
+		gcc $(compileropts) -c -o pop3.o c.pop3
+
 o.progress:	c.progress
 		gcc $(compileropts) -c -o progress.o c.progress
 
@@ -131,6 +140,9 @@ o.sendf:	c.sendf
 o.slist:	c.slist
 		gcc $(compileropts) -c -o slist.o c.slist
 
+o.smtp:		c.smtp
+		gcc $(compileropts) -c -o smtp.o c.smtp
+
 o.speedcheck:	c.speedcheck
 		gcc $(compileropts) -c -o speedcheck.o c.speedcheck
 
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 8fb394577..265f3fe44 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -476,6 +476,7 @@ X_OBJS= \
 	$(DIROBJ)\http_negotiate.obj \

 	$(DIROBJ)\http_ntlm.obj \

 	$(DIROBJ)\if2ip.obj \

+	$(DIROBJ)\imap.obj \

 	$(DIROBJ)\inet_ntop.obj \

 	$(DIROBJ)\inet_pton.obj \

 	$(DIROBJ)\ldap.obj \

@@ -487,12 +488,15 @@ X_OBJS= \
 	$(DIROBJ)\netrc.obj \

         $(DIROBJ)\nonblock.obj \

 	$(DIROBJ)\parsedate.obj \

+	$(DIROBJ)\pingpong.obj \

+	$(DIROBJ)\pop3.obj \

 	$(DIROBJ)\progress.obj \

 	$(DIROBJ)\rawstr.obj \

 	$(DIROBJ)\select.obj \

 	$(DIROBJ)\sendf.obj \

 	$(DIROBJ)\share.obj \

 	$(DIROBJ)\slist.obj \

+	$(DIROBJ)\smtp.obj \

 	$(DIROBJ)\socks.obj \

 	$(DIROBJ)\socks_gssapi.obj \

 	$(DIROBJ)\socks_sspi.obj \

diff --git a/lib/makefile.amiga b/lib/makefile.amiga
index 2dd423e60..b457c1614 100644
--- a/lib/makefile.amiga
+++ b/lib/makefile.amiga
@@ -19,7 +19,7 @@ OBJS = amigaos.c base64.c connect.c content_encoding.c cookie.c dict.c easy.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 curl_rand.c	      \
 	socks_gssapi.c socks_sspi.c curl_sspi.c slist.c nonblock.c            \
-	curl_memrchr.c
+	curl_memrchr.c imap.c pop3.c smtp.c pingpong.c
 
 
 all:	$(OBJS:.c=.o)
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 8c6c926f2..b82dc4b71 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -32,7 +32,7 @@ SOURCE \
   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 nonblock.c        \
-  curl_rand.c curl_memrchr.c
+  curl_rand.c curl_memrchr.c imap.c pop3.c smtp.c pingpong.c
 
 USERINCLUDE   ../../../lib ../../../include/curl
 #ifdef ENABLE_SSL
diff --git a/packages/TPF/curl.mak b/packages/TPF/curl.mak
index 7223b9476..cef61bbcd 100644
--- a/packages/TPF/curl.mak
+++ b/packages/TPF/curl.mak
@@ -61,6 +61,7 @@ C_SRC += http_digest.c
 C_SRC += http_negotiate.c
 C_SRC += http_ntlm.c
 C_SRC += if2ip.c
+C_SRC += imap.c
 C_SRC += inet_ntop.c
 C_SRC += inet_pton.c
 C_SRC += krb4.c
@@ -75,6 +76,8 @@ C_SRC += netrc.c
 C_SRC += nonblock.c
 C_SRC += nss.c
 C_SRC += parsedate.c
+C_SRC += pop3.c
+C_SRC += pingpong.c
 C_SRC += progress.c
 C_SRC += qssl.c
 C_SRC += rawstr.c
@@ -83,6 +86,7 @@ C_SRC += select.c
 C_SRC += sendf.c
 C_SRC += share.c
 C_SRC += slist.c
+C_SRC += smtp.c
 C_SRC += socks.c
 C_SRC += socks_gssapi.c
 C_SRC += socks_sspi.c