From ad6bc4d82e17c65322f2a2ee5fb0b1895dd19e94 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Wed, 12 May 2010 17:31:22 -0700 Subject: [PATCH] Added the new ftp source files to the non-autoconf build files --- lib/Makefile.Watcom | 1 + lib/Makefile.riscos | 16 ++++++++++++++-- lib/Makefile.vc6 | 10 +++++++--- packages/Symbian/group/libcurl.mmp | 1 + packages/TPF/curl.mak | 10 +++++++--- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index afa6da3..6160007 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -44,6 +44,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c & cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c & ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c & netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c & + curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c & krb5.c memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c & multi.c content_encoding.c share.c http_digest.c md5.c curl_rand.c & http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c & diff --git a/lib/Makefile.riscos b/lib/Makefile.riscos index 90f73c9..13a9424 100644 --- a/lib/Makefile.riscos +++ b/lib/Makefile.riscos @@ -9,6 +9,7 @@ objs = o.base64 o.connect o.cookie o.dict \ o.getinfo o.getpass o.hostip \ o.hostip4 o.hostsyn o.http \ o.http_chunks o.inet_ntop o.inet_pton o.if2ip o.krb4 o.ldap \ + o.curl_fnmatch o.fileinfo o.ftplistparser o.wildcard \ o.memdebug o.mprintf o.netrc o.parsedate o.progress \ o.security o.select o.sendf o.speedcheck o.ssluse \ o.strequal o.strtok o.telnet o.timeval \ @@ -159,7 +160,7 @@ o.smtp: c.smtp o.speedcheck: c.speedcheck gcc $(compileropts) -c -o speedcheck.o c.speedcheck -o.gtls: c.gtls +o.gtls: c.gtls gcc $(compileropts) -c -o gtls.o c.gtls o.sslgen: c.sslgen @@ -192,7 +193,7 @@ o.timeval: c.timeval o.transfer: c.transfer gcc $(compileropts) -c -o transfer.o c.transfer -o.url: c.url +o.url: c.url gcc $(compileropts) -c -o url.o c.url o.version: c.version @@ -201,3 +202,14 @@ o.version: c.version o.warnless: c.warnless gcc $(compileropts) -c -o warnless.o c.warnless +o.curl_fnmatch: c.curl_fnmatch + gcc $(compileropts) -c -o curl_fnmatch.o c.curl_fnmatch + +o.fileinfo: c.fileinfo + gcc $(compileropts) -c -o fileinfo.o c.fileinfo + +o.ftplistparser: c.ftplistparser + gcc $(compileropts) -c -o ftplistparser.o c.ftplistparser + +o.wildcard: c.wildcard + gcc $(compileropts) -c -o wildcard.o c.wildcard diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 844cc9c..601ae8e 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -449,6 +449,7 @@ X_OBJS= \ $(DIROBJ)\content_encoding.obj \ $(DIROBJ)\cookie.obj \ $(DIROBJ)\curl_addrinfo.obj \ + $(DIROBJ)\curl_fnmatch.obj \ $(DIROBJ)\curl_memrchr.obj \ $(DIROBJ)\curl_rand.obj \ $(DIROBJ)\curl_sspi.obj \ @@ -456,8 +457,10 @@ X_OBJS= \ $(DIROBJ)\dict.obj \ $(DIROBJ)\easy.obj \ $(DIROBJ)\escape.obj \ + $(DIROBJ)\fileinfo.obj \ $(DIROBJ)\file.obj \ $(DIROBJ)\formdata.obj \ + $(DIROBJ)\ftplistparser.obj \ $(DIROBJ)\ftp.obj \ $(DIROBJ)\getenv.obj \ $(DIROBJ)\getinfo.obj \ @@ -466,16 +469,16 @@ X_OBJS= \ $(DIROBJ)\hmac.obj \ $(DIROBJ)\hostares.obj \ $(DIROBJ)\hostasyn.obj \ - $(DIROBJ)\hostip.obj \ $(DIROBJ)\hostip4.obj \ $(DIROBJ)\hostip6.obj \ + $(DIROBJ)\hostip.obj \ $(DIROBJ)\hostsyn.obj \ $(DIROBJ)\hostthre.obj \ - $(DIROBJ)\http.obj \ $(DIROBJ)\http_chunks.obj \ $(DIROBJ)\http_digest.obj \ $(DIROBJ)\http_negotiate.obj \ $(DIROBJ)\http_ntlm.obj \ + $(DIROBJ)\http.obj \ $(DIROBJ)\if2ip.obj \ $(DIROBJ)\imap.obj \ $(DIROBJ)\inet_ntop.obj \ @@ -499,8 +502,8 @@ X_OBJS= \ $(DIROBJ)\share.obj \ $(DIROBJ)\slist.obj \ $(DIROBJ)\smtp.obj \ - $(DIROBJ)\socks.obj \ $(DIROBJ)\socks_gssapi.obj \ + $(DIROBJ)\socks.obj \ $(DIROBJ)\socks_sspi.obj \ $(DIROBJ)\speedcheck.obj \ $(DIROBJ)\splay.obj \ @@ -518,6 +521,7 @@ X_OBJS= \ $(DIROBJ)\url.obj \ $(DIROBJ)\version.obj \ $(DIROBJ)\warnless.obj \ + $(DIROBJ)\wildcard.obj \ $(RESOURCE) all : $(TARGET) diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index 79c088a..d0ab009 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -25,6 +25,7 @@ SOURCE \ cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \ ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \ netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \ + curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c \ krb5.c memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c \ multi.c content_encoding.c share.c http_digest.c md5.c curl_rand.c \ http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c \ diff --git a/packages/TPF/curl.mak b/packages/TPF/curl.mak index c1b40b3..338a36a 100644 --- a/packages/TPF/curl.mak +++ b/packages/TPF/curl.mak @@ -35,6 +35,7 @@ C_SRC += connect.c C_SRC += content_encoding.c C_SRC += cookie.c C_SRC += curl_addrinfo.c +C_SRC += curl_fnmatch.c C_SRC += curl_memrchr.c C_SRC += curl_rand.c C_SRC += curl_sspi.c @@ -43,8 +44,10 @@ C_SRC += dict.c C_SRC += easy.c C_SRC += escape.c C_SRC += file.c +C_SRC += fileinfo.c C_SRC += formdata.c C_SRC += ftp.c +C_SRC += ftplistparser.c C_SRC += getenv.c C_SRC += getinfo.c C_SRC += gtls.c @@ -52,9 +55,9 @@ C_SRC += hash.c C_SRC += hmac.c C_SRC += hostares.c C_SRC += hostasyn.c -C_SRC += hostip.c C_SRC += hostip4.c C_SRC += hostip6.c +C_SRC += hostip.c C_SRC += hostsyn.c C_SRC += hostthre.c C_SRC += http.c @@ -78,8 +81,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 += pop3.c C_SRC += progress.c C_SRC += qssl.c C_SRC += rawstr.c @@ -96,8 +99,8 @@ C_SRC += socks_sspi.c C_SRC += speedcheck.c C_SRC += splay.c C_SRC += ssh.c -C_SRC += ssluse.c C_SRC += sslgen.c +C_SRC += ssluse.c C_SRC += strdup.c C_SRC += strequal.c C_SRC += strerror.c @@ -110,6 +113,7 @@ C_SRC += transfer.c C_SRC += url.c C_SRC += version.c C_SRC += warnless.c +C_SRC += wildcard.c ####################################################################### # Additions and overrides for gcc compiler flags -- 2.7.4