diff -ru curl-7.10.6-pre4/lib/Makefile.m32 curl-7.10.6-pre4.new/lib/Makefile.m32 --- curl-7.10.6-pre4/lib/Makefile.m32 Fri Feb 28 15:46:38 2003 +++ curl-7.10.6-pre4.new/lib/Makefile.m32 Thu Jul 24 10:59:48 2003 @@ -26,10 +26,11 @@ 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 @@ -43,7 +44,8 @@ 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 + 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 +53,7 @@ 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 -ru curl-7.10.6-pre4/src/Makefile.m32 curl-7.10.6-pre4.new/src/Makefile.m32 --- curl-7.10.6-pre4/src/Makefile.m32 Fri Feb 28 15:49:34 2003 +++ curl-7.10.6-pre4.new/src/Makefile.m32 Thu Jul 24 10:59:54 2003 @@ -22,7 +22,7 @@ ######################################################## ## 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,12 +41,9 @@ 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)