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

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index afa6da3ef92df104847811ba910384874b9336b9..61600078dafb68ce3d678fec532b3c114df41eb7 100644 (file)
--- 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 90f73c92c265ba0fb592319f93136e1f2b85cda9..13a9424eacad153c86f6c1cc5406aec355cfdb45 100644 (file)
--- 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 844cc9c4af5e3ba8f4ff4e14ecad1c4b3abd0d7d..601ae8e44889670aacecaf42844f88eeee7d50bb 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -449,6 +449,7 @@ X_OBJS= \
        $(DIROBJ)\content_encoding.obj \\r
        $(DIROBJ)\cookie.obj \\r
        $(DIROBJ)\curl_addrinfo.obj \\r
+       $(DIROBJ)\curl_fnmatch.obj \\r
        $(DIROBJ)\curl_memrchr.obj \\r
        $(DIROBJ)\curl_rand.obj \\r
        $(DIROBJ)\curl_sspi.obj \\r
@@ -456,8 +457,10 @@ X_OBJS= \
        $(DIROBJ)\dict.obj \\r
        $(DIROBJ)\easy.obj \\r
        $(DIROBJ)\escape.obj \\r
+       $(DIROBJ)\fileinfo.obj \\r
        $(DIROBJ)\file.obj \\r
        $(DIROBJ)\formdata.obj \\r
+       $(DIROBJ)\ftplistparser.obj \\r
        $(DIROBJ)\ftp.obj \\r
        $(DIROBJ)\getenv.obj \\r
        $(DIROBJ)\getinfo.obj \\r
@@ -466,16 +469,16 @@ X_OBJS= \
        $(DIROBJ)\hmac.obj \\r
        $(DIROBJ)\hostares.obj \\r
        $(DIROBJ)\hostasyn.obj \\r
-       $(DIROBJ)\hostip.obj \\r
        $(DIROBJ)\hostip4.obj \\r
        $(DIROBJ)\hostip6.obj \\r
+       $(DIROBJ)\hostip.obj \\r
        $(DIROBJ)\hostsyn.obj \\r
        $(DIROBJ)\hostthre.obj \\r
-       $(DIROBJ)\http.obj \\r
        $(DIROBJ)\http_chunks.obj \\r
        $(DIROBJ)\http_digest.obj \\r
        $(DIROBJ)\http_negotiate.obj \\r
        $(DIROBJ)\http_ntlm.obj \\r
+       $(DIROBJ)\http.obj \\r
        $(DIROBJ)\if2ip.obj \\r
        $(DIROBJ)\imap.obj \\r
        $(DIROBJ)\inet_ntop.obj \\r
@@ -499,8 +502,8 @@ X_OBJS= \
        $(DIROBJ)\share.obj \\r
        $(DIROBJ)\slist.obj \\r
        $(DIROBJ)\smtp.obj \\r
-       $(DIROBJ)\socks.obj \\r
        $(DIROBJ)\socks_gssapi.obj \\r
+       $(DIROBJ)\socks.obj \\r
        $(DIROBJ)\socks_sspi.obj \\r
        $(DIROBJ)\speedcheck.obj \\r
        $(DIROBJ)\splay.obj \\r
@@ -518,6 +521,7 @@ X_OBJS= \
        $(DIROBJ)\url.obj \\r
        $(DIROBJ)\version.obj \\r
        $(DIROBJ)\warnless.obj \\r
+       $(DIROBJ)\wildcard.obj \\r
        $(RESOURCE)\r
 \r
 all : $(TARGET)\r

diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 79c088aa27e97bec49f1d6467e353b2972498645..d0ab0095e8b10118c7812c8b9501b07dcb8212f8 100644 (file)
--- 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 c1b40b3497caa5dbe1035f02c9b47afeae22a990..338a36a6287a6f57e05d6f8ba9ee37b7296e6add 100644 (file)
--- 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