updated for mingw32

diff --git a/CHANGES b/CHANGES
index 48e86970dec0a8201eaf44a4069de4844d390444..90c7e5985aeeee09eb18c923a5d4ffa3838df381 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,11 @@
                                   Changelog
 
 
+Daniel (21 October)
+- Andrés García updated the mingw32 makefiles.
+
+Version 7.10.8-pre5 (21 October 2003)
+
 Daniel (19 October)
 - Georg Horn made libcurl output more info on SSL failures when receiving
   data.

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 7e23688ec671306773e417aeb3a3b9113a959538..a38d117edd19bd082ca63dc4584707ffb91e5bfa 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -1,7 +1,7 @@
 #############################################################
 #
 ## Makefile for building libcurl.a with MingW32 (GCC-3.2) and
-## optionally OpenSSL (0.9.6)
+## optionally OpenSSL (0.9.7)
 ## Use: make -f Makefile.m32
 ##
 ## Comments to: Troy Engel <tengel@sonic.net> or
@@ -34,14 +34,14 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
 
 libcurl_a_LIBRARIES = libcurl.a
 
-libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \
+libcurl_a_SOURCES = arpa_telnet.h file.c netrc.h timeval.c base64.c \
        file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h     \
        progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c          \
        http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h          \
        dict.h getdate.c if2ip.h speedcheck.h urldata.h transfer.c getdate.h  \
        ldap.c ssluse.c version.c transfer.h getenv.c                         \
        ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h         \
-       getpass.c netrc.c telnet.h getinfo.c strequal.c strequal.h easy.c     \
+       netrc.c telnet.h getinfo.c strequal.c strequal.h easy.c     \
        security.h security.c krb4.h krb4.c memdebug.h memdebug.c             \
        inet_ntoa_r.h http_chunks.h http_chunks.c                             \
        strtok.c connect.c hash.c llist.c multi.c share.c share.h             \
@@ -52,7 +52,7 @@ libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \
 libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
        formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
        speedcheck.o getdate.o transfer.o ldap.o ssluse.o version.o \
-       getenv.o escape.o mprintf.o telnet.o getpass.o netrc.o getinfo.o \
+       getenv.o escape.o mprintf.o telnet.o netrc.o getinfo.o \
        strequal.o easy.o security.o krb4.o memdebug.o http_chunks.o \
        strtok.o connect.o hash.o llist.o multi.o share.o \
        content_encoding.o http_digest.o http_negotiate.o http_ntlm.o md5.o

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 4a19ac7cd5998662e700acb7ac29568bbf487784..ba134d8f1f0d9533d774728b4f225036967d44bf 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -2,7 +2,7 @@
 # $Id$
 #
 ## Makefile for building curl.exe with MingW32 (GCC-3.2) and
-## optionally OpenSSL (0.9.6)
+## optionally OpenSSL (0.9.7)
 ##
 ## Use: make -f Makefile.m32 [SSL=1] [DYN=1]
 ##
@@ -32,8 +32,8 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 curl_PROGRAMS = curl.exe
-curl_OBJECTS = main.o hugehelp.o urlglob.o writeout.o
-curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c
+curl_OBJECTS = main.o hugehelp.o urlglob.o writeout.o getpass.o
+curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c getpass.c
 ifdef DYN
   curl_DEPENDENCIES = ../lib/libcurldll.a ../lib/libcurl.dll
   curl_LDADD = -L../lib -lcurldll