Andrés García updated with the added files etc

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 59c03c6c29ad949b2f2f16572da812f60f510fa5..7e23688ec671306773e417aeb3a3b9113a959538 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -26,24 +26,28 @@ ifdef SSL
   DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32
 endif
 ifdef ZLIB
-       INCLUDES += -I"$(ZLIB_PATH)"
-       CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
-       DLL_LIBS += -L$(ZLIB_PATH) -lz
+  INCLUDES += -I"$(ZLIB_PATH)"
+  CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
+  DLL_LIBS += -L$(ZLIB_PATH) -lz
 endif
 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 \
-       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 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\
-       content_encoding.h content_encoding.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     \
+       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             \
+       content_encoding.h content_encoding.c http_digest.h http_digest.c     \
+       http_negotiate.c http_negotiate.h http_ntlm.c http_ntlm.h md5.h       \
+       md5.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 \
@@ -51,7 +55,7 @@ libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
        getenv.o escape.o mprintf.o telnet.o getpass.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
+       content_encoding.o http_digest.o http_negotiate.o http_ntlm.o md5.o
 
 LIBRARIES =  $(libcurl_a_LIBRARIES)
 SOURCES = $(libcurl_a_SOURCES)

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 002c298977aa66c281d7290fdc545559a5808357..4a19ac7cd5998662e700acb7ac29568bbf487784 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -22,7 +22,7 @@ ZLIB_PATH = ../../zlib-1.1.4
 ########################################################
 ## Nothing more to do below this line!
 
-INCLUDES = -I. -I.. -I../include
+INCLUDES = -I. -I.. -I../include -I$(ZLIB_PATH)
 CFLAGS = -g -O2 -DMINGW32
 ifdef SSL
   CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
@@ -41,13 +41,10 @@ else
   curl_DEPENDENCIES = ../lib/libcurl.a
   curl_LDADD = -L../lib -lcurl
 endif
-curl_LDADD += -lwsock32 -lws2_32 -lwinmm
+curl_LDADD += -lwsock32 -lws2_32 -lwinmm -L$(ZLIB_PATH) -lz
 ifdef SSL
   curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32
 endif
-ifdef ZLIB
-  curl_LDADD += -L$(ZLIB_PATH) -lz
-endif
 
 PROGRAMS = $(curl_PROGRAMS)
 SOURCES = $(curl_SOURCES)