changed to use Makefile.inc.

diff --git a/src/Makefile.b32 b/src/Makefile.b32
index c1b58ae1f239de025c04b1f79915c62917bedf0e..221336f80ca0e0ec4bce5ce1b9fb6bc6a1302041 100644 (file)
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -1,44 +1,87 @@
-############################################################\r
-# $Id$\r
-#\r
-#  Makefile.b32 - Borland's C++ Compiler 5.X\r
-#\r
-#  'src' directory\r
-#\r
-#  Written by Jaepil Kim, pit@paradise.net.nz\r
-############################################################\r
-\r
-# Set program's name\r
-PROGNAME  = curl.exe\r
-\r
-# Setup environment\r
-CXX       = bcc32\r
-CXXFLAGS  = -5 -O2 -WC -w-par -w-csu -w-aus\r
-RM        = del\r
-TOPDIR    = ..\r
-DEFINES   = -DNDEBUG -DLIBCURL_BIGENDIAN=0 -DWIN32 -D_CONSOLE -D_MBCS\r
-LD       = bcc32\r
-LDFLAGS          = -lap -e$(PROGNAME)\r
-INCDIRS   = -I$(TOPDIR)/include\r
-LIBCURLLIB= $(TOPDIR)/lib/libcurl.lib\r
-\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
-PROGRAMS  = \\r
-       curl.exe \r
-\r
-.c.obj:\r
-       $(CXX) -c $(INCDIRS) $(CXXFLAGS) $(DEFINES) $*.c\r
-\r
-all: $(PROGRAMS)\r
-\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
-        $(RM) *.exe\r
-        $(RM) *.tds\r
+############################################################
+# $Id$
+#
+#  Makefile.b32 - Borland's C++ Compiler 5.X
+#
+#  'src' directory
+#
+#  'BCCDIR' has to be set up to point to the base directory
+#  of the compiler, i.e. SET BCCDIR = c:\Borland\BCC55
+#  where c:\Borland\BCC55 is the compiler is installed
+#
+#  Written by Jaepil Kim, pit@paradise.net.nz
+############################################################
+
+# Edit the path below to point to the base of your Zlib sources.
+#ZLIB_PATH = ../../zlib-1.2.1
+
+# Edit the path below to point to the base of your OpenSSL package.
+!ifndef OPENSSL_PATH
+OPENSSL_PATH = ../../openssl-0.9.7d
+!endif
+
+# Set program's name
+PROGNAME = curl.exe
+
+# Setup environment
+CXX      = bcc32
+LD       = bcc32
+CP       = copy
+RM       = del
+LIB      = tlib
+TOPDIR   = ..
+CURNTDIR = .
+
+CXXFLAGS = -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu -w-pro -tWM
+# CXXFLAGS = -5 -O2 -WC -w-par -w-csu -w-aus
+LDFLAGS  = -lap
+
+# If you build without SSL support, remove "-DUSE_SSLEAY" from the line below.
+# DEFINES  = -DLIBCURL_BIGENDIAN=0 -DNDEBUG -DWIN32 -DCONSOLE -DMBCS -DUSE_SSLEAY
+DEFINES  = -DNDEBUG -DLIBCURL_BIGENDIAN=0 -DWIN32 -D_CONSOLE -D_MBCS
+
+INCDIRS  = -I$(CURNTDIR);$(TOPDIR)/include;$(TOPDIR)/lib
+LINKLIB  = $(BCCDIR)/lib/psdk/ws2_32.lib
+
+LIBCURLLIB = $(TOPDIR)/lib/libcurl.lib
+
+.SUFFIXES: .c
+
+.autodepend
+
+# Makefile.inc provides the CSOURCES and HHEADERS defines
+top_srcdir = ..
+!include Makefile.inc
+
+CSOURCES = $(CURL_SOURCES) $(CURLX_ONES)
+OBJECTS  = $(CSOURCES:.c=.obj)
+
+.c.obj:
+       $(CXX) -c $(INCDIRS) $(CXXFLAGS) $(DEFINES) $<
+
+all:   $(PROGNAME)
+
+clean:
+       -$(RM) $(PROGNAME)
+       -$(RM) *.obj
+       -$(RM) hugehelp.c
+
+$(PROGNAME): $(OBJECTS) $(LIBCURLLIB) $(LINKLIB)
+       @-$(RM) $@
+       $(LD) $(LDFLAGS) -e $@ $**
+
+hugehelp.c: hugehelp.c.cvs
+       @echo Creating $@
+       @$(CP) $** $@
+
+sys/utime.h: $(BCCDIR)\include\utime.h
+       @echo Fix missing header $@
+       @-mkdir sys
+       @$(CP) $** sys
+
+main.c: sys/utime.h
+
+test:
+       @echo OBJECTS = $(OBJECTS)
+
+