James Clancy updated the Borland makefiles

4 files changed, 14 insertions, 11 deletions

diff --git a/CHANGES b/CHANGES
index b4e34de56..2feb0a12e 100644
--- 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 f9f41b701..cf290c370 100644
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -18,18 +18,19 @@ TOPDIR	   = ..
 CURNTDIR   = .

 CXXFLAGS   = -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu -w-pro -tWM

 DEFINES    = -DLIBCURL_BIGENDIAN=0 -DNDEBUG -DWIN32 -DCONSOLE -DMBCS

-INCDIRS    = -I$(CURNTDIR);$(TOPDIR)/include/

+INCDIRS    = -I$(CURNTDIR);$(TOPDIR)\include\
 

 # 'BCCDIR' has to be set up in your c:\autoexec.bat

 # i.e. SET BCCDIR = c:\Borland\BCC55

 # where c:\Borland\BCC55 is the compiler is installed

-LINKLIB	   = $(BCCDIR)/lib/psdk/ws2_32.lib

+LINKLIB	   = $(BCCDIR)\lib\psdk\ws2_32.lib
 LIBCURLLIB = libcurl.lib

 

 .SUFFIXES: .c

 

 SOURCES	   = \

 	base64.c \

+	md5.c \
 	cookie.c \

 	transfer.c \

 	escape.c \

@@ -37,6 +38,7 @@ SOURCES	   = \
 	ftp.c \

 	http.c \

         http_chunks.c \

+	http_digest.c \
 	ldap.c \

 	dict.c \

 	telnet.c \

@@ -80,5 +82,3 @@ clean:
 $(LIBCURLLIB):  $(LINKLIB) $(OBJECTS) Makefile.b32.resp

 	-$(RM) $(LIBCURLLIB)

 	$(LIB) $(LIBCURLLIB) @Makefile.b32.resp

-

-

diff --git a/lib/Makefile.b32.resp b/lib/Makefile.b32.resp
index 3d784fd4a..c8ca4486e 100644
--- a/lib/Makefile.b32.resp
+++ b/lib/Makefile.b32.resp
@@ -1,4 +1,5 @@
 +base64.obj &

++md5.obj &
 +cookie.obj &

 +transfer.obj &

 +escape.obj &

@@ -6,6 +7,7 @@
 +ftp.obj &

 +http.obj &

 +http_chunks.obj &

++http_digest.obj &
 +ldap.obj &

 +dict.obj &

 +telnet.obj &

diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 5ec633c45..c1b58ae1f 100644
--- 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

 # i.e. SET BCCDIR = c:\Borland\BCC55

 # where c:\Borland\BCC55 is the compiler is installed

-LINKLIB   = $(BCCDIR)/lib/psdk/wsock32.lib

-

+LINKLIB  = $(BCCDIR)\Lib\psdk\ws2_32.lib 
 

 PROGRAMS  = \

 	curl.exe 

@@ -36,8 +35,8 @@ PROGRAMS  = \
 

 all: $(PROGRAMS)

 

-curl.exe: $(LIBCURLLIB) $(LINKLIB) hugehelp.obj writeout.obj urlglob.obj main.obj

-	$(LD) $(LDFLAGS) hugehelp.obj writeout.obj urlglob.obj main.obj $(LIBCURLLIB) $(LINKLIB)

+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)
 

 clean:

 	$(RM) *.obj