James Clancy updated the Borland makefiles

diff --git a/CHANGES b/CHANGES
index b4e34de5619b777abcbabad8e8fdd29b9c55d8f7..2feb0a12e451df335ffffc29868dd7efa56821d6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,13 +8,15 @@
 
 
 Daniel (27 November)
-- Markus Moeller improvied the SPNEGO detection in the configure script.
+- James Clancy made the Borland Makefiles up to date.
+
+- Markus Moeller improved the SPNEGO detection in the configure script.
 
 Daniel (25 November)
 - 'Dave' filed bug report #848371, identifying that if you'd do POST over a
   proxy to a https server, libcurl didn't POST at all, it just made a GET! It
-  turned out to be because libcurl wronly didn't consider the authentication
-  "negotitation phase" to be complete yet.
+  turned out to be because libcurl wrongly didn't consider the authentication
+  "negotiation phase" to be complete yet.
 
   I added test case 95 to verify my fix for this.
 

diff --git a/lib/Makefile.b32 b/lib/Makefile.b32
index f9f41b701a24cbe955a7cc9a07987c09b580cc77..cf290c3702125e76e95f762cd63ee2bbd9a2e8f9 100644 (file)
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -18,18 +18,19 @@ TOPDIR         = ..
 CURNTDIR   = .\r
 CXXFLAGS   = -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu -w-pro -tWM\r
 DEFINES    = -DLIBCURL_BIGENDIAN=0 -DNDEBUG -DWIN32 -DCONSOLE -DMBCS\r
-INCDIRS    = -I$(CURNTDIR);$(TOPDIR)/include/\r
+INCDIRS    = -I$(CURNTDIR);$(TOPDIR)\include\
 \r
 # 'BCCDIR' has to be set up in your c:\autoexec.bat\r
 # i.e. SET BCCDIR = c:\Borland\BCC55\r
 # where c:\Borland\BCC55 is the compiler is installed\r
-LINKLIB           = $(BCCDIR)/lib/psdk/ws2_32.lib\r
+LINKLIB           = $(BCCDIR)\lib\psdk\ws2_32.lib
 LIBCURLLIB = libcurl.lib\r
 \r
 .SUFFIXES: .c\r
 \r
 SOURCES           = \\r
        base64.c \\r
+       md5.c \
        cookie.c \\r
        transfer.c \\r
        escape.c \\r
@@ -37,6 +38,7 @@ SOURCES          = \
        ftp.c \\r
        http.c \\r
         http_chunks.c \\r
+       http_digest.c \
        ldap.c \\r
        dict.c \\r
        telnet.c \\r
@@ -80,5 +82,3 @@ clean:
 $(LIBCURLLIB):  $(LINKLIB) $(OBJECTS) Makefile.b32.resp\r
        -$(RM) $(LIBCURLLIB)\r
        $(LIB) $(LIBCURLLIB) @Makefile.b32.resp\r
-\r
-\r

diff --git a/lib/Makefile.b32.resp b/lib/Makefile.b32.resp
index 3d784fd4a3b7a3380fc59926b0147e3327432a37..c8ca4486eaa7ae72c50730962fb8841ce56471a3 100644 (file)
--- a/lib/Makefile.b32.resp
+++ b/lib/Makefile.b32.resp
@@ -1,4 +1,5 @@
 +base64.obj &\r
++md5.obj &
 +cookie.obj &\r
 +transfer.obj &\r
 +escape.obj &\r
@@ -6,6 +7,7 @@
 +ftp.obj &\r
 +http.obj &\r
 +http_chunks.obj &\r
++http_digest.obj &
 +ldap.obj &\r
 +dict.obj &\r
 +telnet.obj &\r

diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 5ec633c456aab9a9c7585ed5ec2c0b111eded4af..c1b58ae1f239de025c04b1f79915c62917bedf0e 100644 (file)
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -25,8 +25,7 @@ LIBCURLLIB= $(TOPDIR)/lib/libcurl.lib
 # 'BCCDIR' has to be set up in your c:\autoexec.bat\r
 # i.e. SET BCCDIR = c:\Borland\BCC55\r
 # where c:\Borland\BCC55 is the compiler is installed\r
-LINKLIB   = $(BCCDIR)/lib/psdk/wsock32.lib\r
-\r
+LINKLIB  = $(BCCDIR)\Lib\psdk\ws2_32.lib 
 \r
 PROGRAMS  = \\r
        curl.exe \r
@@ -36,8 +35,8 @@ PROGRAMS  = \
 \r
 all: $(PROGRAMS)\r
 \r
-curl.exe: $(LIBCURLLIB) $(LINKLIB) hugehelp.obj writeout.obj urlglob.obj main.obj\r
-       $(LD) $(LDFLAGS) hugehelp.obj writeout.obj urlglob.obj main.obj $(LIBCURLLIB) $(LINKLIB)\r
+curl.exe: $(LIBCURLLIB) $(LINKLIB) hugehelp.obj writeout.obj urlglob.obj main.obj homedir.obj
+       $(LD) $(LDFLAGS) hugehelp.obj writeout.obj urlglob.obj main.obj homedir.obj $(LIBCURLLIB) $(LINKLIB)
 \r
 clean:\r
        $(RM) *.obj\r