changed to use Makefile.inc.

diff --git a/lib/Makefile.b32 b/lib/Makefile.b32
index edb4505..a57bf1f 100644 (file)
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -1,90 +1,62 @@
-############################################################\r
-# $Id$\r
-#\r
-#  Makefile.b32 - Borland's C++ Compiler 5.X\r
-#\r
-#  'lib' directory\r
-#\r
-#  Requires 'Makefile.b32.resp'\r
-#\r
-#  Written by Jaepil Kim, pit@paradise.net.nz\r
-############################################################\r
-\r
-# Setup environment\r
-CXX       = bcc32\r
-RM        = del\r
-LIB       = tlib\r
-TOPDIR    = ..\r
-CURNTDIR   = .\r
-CXXFLAGS   = -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu \\r
-             -w-pro -tWM\r
-\r
-# If you build without SSL support, remove "-DUSE_SSLEAY" from the line below.\r
-DEFINES    = -DLIBCURL_BIGENDIAN=0 -DNDEBUG -DWIN32 -DCONSOLE -DMBCS \\r
-             -DUSE_SSLEAY\r
-INCDIRS    = -I$(CURNTDIR);$(TOPDIR)\include\\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
-LIBCURLLIB = libcurl.lib\r
-\r
-.SUFFIXES: .c\r
-\r
-SOURCES           = \\r
-       base64.c \\r
-       md5.c \\r
-       cookie.c \\r
-       transfer.c \\r
-       escape.c \\r
-       formdata.c \\r
-       ftp.c \\r
-       http.c \\r
-        http_chunks.c \\r
-       http_digest.c \\r
-       http_ntlm.c \\r
-       ldap.c \\r
-       dict.c \\r
-       telnet.c \\r
-       getdate.c \\r
-       getenv.c \\r
-       hostip.c \\r
-       if2ip.c \\r
-       mprintf.c \\r
-       netrc.c \\r
-       progress.c \\r
-       sendf.c \\r
-       inet_pton.c \\r
-       speedcheck.c \\r
-       ssluse.c \\r
-       timeval.c \\r
-       url.c \\r
-       file.c \\r
-       getinfo.c \\r
-       version.c \\r
-       easy.c \\r
-       strequal.c \\r
-       strtok.c \\r
-       strtoofft.c \\r
-       connect.c \\r
-        hash.c \\r
-        share.c \\r
-        llist.c \\r
-        multi.c \\r
-        content_encoding.c\r
-\r
-OBJECTS = $(SOURCES:.c=.obj)\r
-\r
-.c.obj:\r
-       $(CXX) -c $(INCDIRS) $(CXXFLAGS) $(DEFINES) $<\r
-\r
-all:   $(LIBCURLLIB)\r
-\r
-clean:\r
-       -$(RM) $(LIBCURLLIB)\r
-        -$(RM) *.obj\r
-\r
-$(LIBCURLLIB):  $(LINKLIB) $(OBJECTS) Makefile.b32.resp\r
-       -$(RM) $(LIBCURLLIB)\r
-       $(LIB) $(LIBCURLLIB) @Makefile.b32.resp\r
+############################################################
+# $Id$
+#
+#  Makefile.b32 - Borland's C++ Compiler 5.X
+#
+#  'lib' 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
+#
+#  Requires 'Makefile.b32.resp'
+#
+#  Written by Jaepil Kim, pit@paradise.net.nz
+############################################################
+
+# Setup environment
+CXX      = 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
+
+# If you build without SSL support, remove "-DUSE_SSLEAY" from the line below.
+DEFINES  = -DLIBCURL_BIGENDIAN=0 -DNDEBUG -DWIN32 -DCONSOLE -DMBCS -DUSE_SSLEAY
+# DEFINES  = -DLIBCURL_BIGENDIAN=0 -DNDEBUG -DWIN32 -DCONSOLE -DMBCS
+
+INCDIRS  = -I$(CURNTDIR);$(TOPDIR)\include
+LINKLIB  = $(BCCDIR)\lib\psdk\ws2_32.lib
+
+LIBCURLLIB = libcurl.lib
+
+.SUFFIXES: .c
+
+# Makefile.inc provides the CSOURCES and HHEADERS defines
+!include Makefile.inc
+
+OBJECTS = $(CSOURCES:.c=.obj)
+
+.c.obj:
+       $(CXX) -c $(INCDIRS) $(CXXFLAGS) $(DEFINES) $<
+
+all:   $(LIBCURLLIB)
+
+clean:
+       -$(RM) $(LIBCURLLIB)
+       -$(RM) *.obj
+
+$(LIBCURLLIB): $(LINKLIB) $(OBJECTS) Makefile.b32.resp
+       -$(RM) $(LIBCURLLIB)
+       $(LIB) $(LIBCURLLIB) @Makefile.b32.resp
+
+getdate.c:
+       @echo Creating $@
+       @-$(RM) getdate.y
+       @$(CP) getdate.c.cvs $@
+
+
+