build: remove the Borland specific makefiles

According to the user survey 2018, not even one out of 670 users use
them. Nobody on the mailing list spoke up for them either.

Closes #2629

Daniel Stenberg 6 months ago
parent
commit
aca1aba0bd
6 changed files with 5 additions and 415 deletions
  1. 1 25
      Makefile.dist
  2. 0 47
      docs/INSTALL.md
  3. 2 2
      lib/Makefile.am
  4. 0 185
      lib/Makefile.b32
  5. 2 2
      src/Makefile.am
  6. 0 154
      src/Makefile.b32

+ 1 - 25
Makefile.dist

@@ -5,7 +5,7 @@
5 5
 #                            | (__| |_| |  _ <| |___
6 6
 #                             \___|\___/|_| \_\_____|
7 7
 #
8
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
8
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
9 9
 #
10 10
 # This software is licensed as described in the file COPYING, which
11 11
 # you should have received as part of this distribution. The terms
@@ -28,30 +28,6 @@ ssl:
28 28
 	./configure --with-ssl
29 29
 	make
30 30
 
31
-borland:
32
-	cd lib
33
-	$(MAKE) -f Makefile.b32
34
-	cd ..\src
35
-	$(MAKE) -f Makefile.b32
36
-
37
-borland-ssl:
38
-	cd lib
39
-	$(MAKE) -f Makefile.b32 WITH_SSL=1
40
-	cd ..\src
41
-	$(MAKE) -f Makefile.b32 WITH_SSL=1
42
-
43
-borland-ssl-zlib:
44
-	cd lib
45
-	$(MAKE) -f Makefile.b32 WITH_SSL=1 WITH_ZLIB=1
46
-	cd ..\src
47
-	$(MAKE) -f Makefile.b32 WITH_SSL=1 WITH_ZLIB=1
48
-
49
-borland-clean:
50
-	cd lib
51
-	$(MAKE) -f Makefile.b32 clean
52
-	cd ..\src
53
-	$(MAKE) -f Makefile.b32 clean
54
-
55 31
 watcom: .SYMBOLIC
56 32
 	cd lib && $(MAKE) -u -f Makefile.Watcom
57 33
 	cd src && $(MAKE) -u -f Makefile.Watcom

+ 0 - 47
docs/INSTALL.md

@@ -177,53 +177,6 @@ executable in /bin/ or you'll see the configure fail toward the end.
177 177
 
178 178
 Run `make`
179 179
 
180
-## Borland C++ compiler
181
-
182
-Ensure that your build environment is properly set up to use the compiler and
183
-associated tools. PATH environment variable must include the path to bin
184
-subdirectory of your compiler installation, eg: `c:\Borland\BCC55\bin`
185
-
186
-It is advisable to set environment variable BCCDIR to the base path of the
187
-compiler installation.
188
-
189
-    set BCCDIR=c:\Borland\BCC55
190
-
191
-In order to build a plain vanilla version of curl and libcurl run the
192
-following command from curl's root directory:
193
-
194
-    make borland
195
-
196
-To build curl and libcurl with zlib and OpenSSL support set environment
197
-variables `ZLIB_PATH` and `OPENSSL_PATH` to the base subdirectories of the
198
-already built zlib and OpenSSL libraries and from curl's root directory run
199
-command:
200
-
201
-    make borland-ssl-zlib
202
-
203
-libcurl library will be built in 'lib' subdirectory while curl tool is built
204
-in 'src' subdirectory. In order to use libcurl library it is advisable to
205
-modify compiler's configuration file bcc32.cfg located in
206
-`c:\Borland\BCC55\bin` to reflect the location of libraries include paths for
207
-example the '-I' line could result in something like:
208
-
209
-    -I"c:\Borland\BCC55\include;c:\curl\include;c:\openssl\inc32"
210
-
211
-bcc3.cfg `-L` line could also be modified to reflect the location of of
212
-libcurl library resulting for example:
213
-
214
-    -L"c:\Borland\BCC55\lib;c:\curl\lib;c:\openssl\out32"
215
-
216
-In order to build sample program `simple.c` from the docs\examples
217
-subdirectory run following command from mentioned subdirectory:
218
-
219
-    bcc32 simple.c libcurl.lib cw32mt.lib
220
-
221
-In order to build sample program simplessl.c an SSL enabled libcurl is
222
-required, as well as the OpenSSL libeay32.lib and ssleay32.lib libraries.
223
-
224
-In order to build sample program `sslbackend.c`, an SSL enabled libcurl
225
-is required.
226
-
227 180
 ## Disabling Specific Protocols in Windows builds
228 181
 
229 182
 The configure utility, unfortunately, is not available for the Windows

+ 2 - 2
lib/Makefile.am

@@ -5,7 +5,7 @@
5 5
 #                            | (__| |_| |  _ <| |___
6 6
 #                             \___|\___/|_| \_\_____|
7 7
 #
8
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
8
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
9 9
 #
10 10
 # This software is licensed as described in the file COPYING, which
11 11
 # you should have received as part of this distribution. The terms
@@ -23,7 +23,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
23 23
 
24 24
 CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
25 25
 
26
-EXTRA_DIST = Makefile.b32 Makefile.m32 config-win32.h	\
26
+EXTRA_DIST = Makefile.m32 config-win32.h	                        \
27 27
  config-win32ce.h config-riscos.h config-mac.h curl_config.h.in		\
28 28
  makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h	\
29 29
  makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h	\

+ 0 - 185
lib/Makefile.b32

@@ -1,185 +0,0 @@
1
-#***************************************************************************
2
-#                                  _   _ ____  _
3
-#  Project                     ___| | | |  _ \| |
4
-#                             / __| | | | |_) | |
5
-#                            | (__| |_| |  _ <| |___
6
-#                             \___|\___/|_| \_\_____|
7
-#
8
-# Copyright (C) 2000, Jaepil Kim, <pit@paradise.net.nz>.
9
-# Copyright (C) 2001 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
10
-#
11
-# This software is licensed as described in the file COPYING, which
12
-# you should have received as part of this distribution. The terms
13
-# are also available at https://curl.haxx.se/docs/copyright.html.
14
-#
15
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
16
-# copies of the Software, and permit persons to whom the Software is
17
-# furnished to do so, under the terms of the COPYING file.
18
-#
19
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
20
-# KIND, either express or implied.
21
-#
22
-#***************************************************************************
23
-
24
-############################################################
25
-#
26
-#  Makefile.b32 - Borland's C++ Compiler 5.X
27
-#
28
-#  'BCCDIR' has to be set up to point to the base directory
29
-#  of the compiler, i.e. SET BCCDIR = c:\Borland\BCC55
30
-#
31
-############################################################
32
-
33
-!if "$(__MAKE__)" == ""
34
-!error __MAKE__ not defined. Use Borlands's MAKE to process this makefile.
35
-!endif
36
-
37
-# Borland's $(MAKEDIR) expands to the path where make.exe is located,
38
-# use this feature to define BCCDIR when user has not defined BCCDIR.
39
-!ifndef BCCDIR
40
-BCCDIR = $(MAKEDIR)\..
41
-!endif
42
-
43
-# Edit the path below to point to the base of your Zlib sources.
44
-!ifndef ZLIB_PATH
45
-ZLIB_PATH = ..\..\zlib-1.2.8
46
-!endif
47
-
48
-# Edit the path below to point to the base of your OpenSSL package.
49
-!ifndef OPENSSL_PATH
50
-OPENSSL_PATH = ..\..\openssl-1.0.2a
51
-!endif
52
-
53
-# Set libcurl static lib, dll and import lib
54
-LIBCURL_LIB    = libcurl.lib
55
-LIBCURL_DLL    = libcurl.dll
56
-LIBCURL_IMPLIB = libcurl_imp.lib
57
-
58
-# Setup environment
59
-PP_CMD   = cpp32 -q -P-
60
-CC_CMD   = bcc32 -q -c
61
-LD       = bcc32
62
-RM       = del 2>NUL
63
-MKDIR    = md
64
-RMDIR    = rd /q
65
-LIB      = tlib
66
-IMPLIB   = implib
67
-
68
-CC_FLAGS = -5 -O2 -tWM -w -w-aus -w-ccc -w-dup -w-prc -w-pro -w-rch -w-sig -w-spa -w-inl -w-pia -w-pin -Dinline=__inline
69
-LIBFLAGS = /C /P32
70
-LDFLAGS  = -q -lq -laa -tWD
71
-
72
-SRCDIR   = .;.\vauth;.\vtls
73
-OBJDIR   = .\BCC_objs
74
-INCDIRS  = -I.;.\lib;..\include
75
-LINKLIB  = $(BCCDIR)\lib\cw32mt.lib $(BCCDIR)\lib\ws2_32.lib
76
-DEFINES  = -DNDEBUG -DWIN32 -DBUILDING_LIBCURL
77
-
78
-# By default SSPI support is enabled for BCC
79
-!ifndef DISABLE_SSPI
80
-DEFINES  = $(DEFINES) -DUSE_WINDOWS_SSPI
81
-!endif
82
-
83
-# By default LDAP support is disabled for BCC
84
-!ifndef WITH_LDAP
85
-DEFINES  = $(DEFINES) -DCURL_DISABLE_LDAP
86
-!endif
87
-
88
-# ZLIB support is enabled setting WITH_ZLIB=1
89
-!ifdef WITH_ZLIB
90
-DEFINES  = $(DEFINES) -DHAVE_LIBZ -DHAVE_ZLIB_H
91
-INCDIRS  = $(INCDIRS);$(ZLIB_PATH)
92
-LINKLIB  = $(LINKLIB) $(ZLIB_PATH)\zlib.lib
93
-!endif
94
-
95
-# SSL support is enabled setting WITH_SSL=1
96
-!ifdef WITH_SSL
97
-DEFINES  = $(DEFINES) -DUSE_OPENSSL
98
-INCDIRS  = $(INCDIRS);$(OPENSSL_PATH)\inc32;$(OPENSSL_PATH)\inc32\openssl
99
-LINKLIB  = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\libeay32.lib
100
-!endif
101
-
102
-.autodepend
103
-
104
-.path.c   = $(SRCDIR)
105
-.path.obj = $(OBJDIR)
106
-.path.int = $(OBJDIR)
107
-
108
-# Makefile.inc provides the CSOURCES and HHEADERS defines
109
-!include Makefile.inc
110
-
111
-# Borland's command line librarian program TLIB version 4.5 is not capable
112
-# of building a library when any of its objects contains an hyphen in its
113
-# name, due to a command line parsing bug. In order to workaround this, we
114
-# build source files with hyphens in their name as objects with underscores
115
-# using explicit compilation build rules instead of implicit ones.
116
-
117
-NOHYPHEN1 = $(CSOURCES:-=_)
118
-NOHYPHEN2 = $(NOHYPHEN1:vauth/=)
119
-NOHYPHEN3 = $(NOHYPHEN2:vtls/=)
120
-
121
-OBJECTS = $(NOHYPHEN3:.c=.obj)
122
-PREPROCESSED = $(NOHYPHEN3:.c=.int)
123
-
124
-# Borland's command line compiler (BCC32) version 5.5.1 integrated
125
-# preprocessor has a bug which results in silently generating wrong
126
-# definitions for libcurl macros such as CURL_OFF_T_C, on the other
127
-# hand Borland's command line preprocessor (CPP32) version 5.5.1 does
128
-# not have the bug and achieves proper results. In order to avoid the
129
-# silent bug we first preprocess source files and later compile the
130
-# preprocessed result.
131
-
132
-.c.obj:
133
-	@-$(RM) $(@R).int
134
-	$(PP_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$(@R).int $(<)
135
-	$(CC_CMD) $(CC_FLAGS) -o$(@) $(@R).int
136
-
137
-all:	$(OBJDIR) $(LIBCURL_LIB) $(LIBCURL_DLL)
138
-
139
-asyn_ares.obj: asyn-ares.c
140
-	@-$(RM) $(@R).int
141
-	$(PP_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$(@R).int $(?)
142
-	$(CC_CMD) $(CC_FLAGS) -o$(@) $(@R).int
143
-
144
-asyn_thread.obj: asyn-thread.c
145
-	@-$(RM) $(@R).int
146
-	$(PP_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$(@R).int $(?)
147
-	$(CC_CMD) $(CC_FLAGS) -o$(@) $(@R).int
148
-
149
-non_ascii.obj: non-ascii.c
150
-	@-$(RM) $(@R).int
151
-	$(PP_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$(@R).int $(?)
152
-	$(CC_CMD) $(CC_FLAGS) -o$(@) $(@R).int
153
-
154
-clean:
155
-	cd $(OBJDIR)
156
-	@-$(RM) $(OBJECTS)
157
-	@-$(RM) $(PREPROCESSED)
158
-	cd ..
159
-	@-$(RMDIR) $(OBJDIR)
160
-	@-$(RM) $(LIBCURL_LIB)
161
-	@-$(RM) $(LIBCURL_IMPLIB)
162
-	@-$(RM) libcurl.tds
163
-
164
-$(OBJDIR):
165
-	@-$(RMDIR) $(OBJDIR)
166
-	@-$(MKDIR) $(OBJDIR)
167
-
168
-$(LIBCURL_LIB): $(OBJECTS)
169
-	@-$(RM) $(LIBCURL_LIB)
170
-	$(LIB) $(LIBFLAGS) $@ @&&!
171
-+$(**: = &^
172
-+)
173
-!
174
-
175
-$(LIBCURL_DLL) $(LIBCURL_IMPLIB): $(OBJECTS) $(LINKLIB)
176
-	@-$(RM) $(LIBCURL_DLL)
177
-	@-$(RM) $(LIBCURL_IMPLIB)
178
-	$(LD) $(LDFLAGS) -e$(LIBCURL_DLL) @&&!
179
-$(**: = ^
180
-)
181
-!
182
-	$(IMPLIB) $(LIBCURL_IMPLIB) $(LIBCURL_DLL)
183
-
184
-
185
-# End of Makefile.b32

+ 2 - 2
src/Makefile.am

@@ -5,7 +5,7 @@
5 5
 #                            | (__| |_| |  _ <| |___
6 6
 #                             \___|\___/|_| \_\_____|
7 7
 #
8
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
8
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
9 9
 #
10 10
 # This software is licensed as described in the file COPYING, which
11 11
 # you should have received as part of this distribution. The terms
@@ -88,7 +88,7 @@ CLEANFILES = tool_hugehelp.c
88 88
 # embedded text.
89 89
 NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script
90 90
 
91
-EXTRA_DIST = mkhelp.pl makefile.dj Makefile.b32		\
91
+EXTRA_DIST = mkhelp.pl makefile.dj                      		\
92 92
  Makefile.m32 macos/curl.mcp.xml.sit.hqx macos/MACINSTALL.TXT		\
93 93
  macos/src/curl_GUSIConfig.cpp macos/src/macos_main.cpp makefile.amiga	\
94 94
  curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt

+ 0 - 154
src/Makefile.b32

@@ -1,154 +0,0 @@
1
-#***************************************************************************
2
-#                                  _   _ ____  _
3
-#  Project                     ___| | | |  _ \| |
4
-#                             / __| | | | |_) | |
5
-#                            | (__| |_| |  _ <| |___
6
-#                             \___|\___/|_| \_\_____|
7
-#
8
-# Copyright (C) 2000, Jaepil Kim, <pit@paradise.net.nz>.
9
-# Copyright (C) 2001 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
10
-#
11
-# This software is licensed as described in the file COPYING, which
12
-# you should have received as part of this distribution. The terms
13
-# are also available at https://curl.haxx.se/docs/copyright.html.
14
-#
15
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
16
-# copies of the Software, and permit persons to whom the Software is
17
-# furnished to do so, under the terms of the COPYING file.
18
-#
19
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
20
-# KIND, either express or implied.
21
-#
22
-#***************************************************************************
23
-
24
-############################################################
25
-#
26
-#  Makefile.b32 - Borland's C++ Compiler 5.X
27
-#
28
-#  'BCCDIR' has to be set up to point to the base directory
29
-#  of the compiler, i.e. SET BCCDIR = c:\Borland\BCC55
30
-#
31
-############################################################
32
-
33
-!if "$(__MAKE__)" == ""
34
-!error __MAKE__ not defined. Use Borlands's MAKE to process this makefile.
35
-!endif
36
-
37
-# Borland's $(MAKEDIR) expands to the path where make.exe is located,
38
-# use this feature to define BCCDIR when user has not defined BCCDIR.
39
-!ifndef BCCDIR
40
-BCCDIR = $(MAKEDIR)\..
41
-!endif
42
-
43
-# Edit the path below to point to the base of your Zlib sources.
44
-!ifndef ZLIB_PATH
45
-ZLIB_PATH = ..\..\zlib-1.2.8
46
-!endif
47
-
48
-# Edit the path below to point to the base of your OpenSSL package.
49
-!ifndef OPENSSL_PATH
50
-OPENSSL_PATH = ..\..\openssl-1.0.2a
51
-!endif
52
-
53
-# Set program's name
54
-PROGNAME = curl.exe
55
-
56
-# Setup environment
57
-PP_CMD   = cpp32 -q -P-
58
-CC_CMD   = bcc32 -q -c
59
-LD       = bcc32
60
-RM       = del 2>NUL
61
-MKDIR    = md
62
-RMDIR    = rd /q 2>NUL
63
-COPY     = $(COMSPEC) /c copy /y
64
-
65
-CC_FLAGS = -5 -O2 -tWM -w -w-aus -w-ccc -w-dup -w-prc -w-pro -w-rch -w-sig -w-spa -w-inl -w-pia -w-pin -Dinline=__inline
66
-LDFLAGS  = -q -lq -lap
67
-
68
-SRCDIRS  = .;..\lib
69
-OBJDIR   = .\BCC_objs
70
-INCDIRS  = -I.;..\include;..\lib
71
-LINKLIB  = $(BCCDIR)\lib\cw32mt.lib $(BCCDIR)\lib\ws2_32.lib
72
-DEFINES  = -DNDEBUG -DWIN32
73
-
74
-!ifdef DYNAMIC
75
-LIBCURL_LIB = ..\lib\libcurl_imp.lib
76
-!else
77
-LIBCURL_LIB = ..\lib\libcurl.lib
78
-DEFINES = $(DEFINES) -DCURL_STATICLIB
79
-!endif
80
-
81
-# ZLIB support is enabled setting WITH_ZLIB=1
82
-!ifdef WITH_ZLIB
83
-DEFINES  = $(DEFINES) -DHAVE_LIBZ -DHAVE_ZLIB_H
84
-INCDIRS  = $(INCDIRS);$(ZLIB_PATH)
85
-LINKLIB  = $(LINKLIB) $(ZLIB_PATH)\zlib.lib
86
-!endif
87
-
88
-# SSL support is enabled setting WITH_SSL=1
89
-!ifdef WITH_SSL
90
-DEFINES  = $(DEFINES) -DUSE_OPENSSL
91
-INCDIRS  = $(INCDIRS);$(OPENSSL_PATH)\inc32;$(OPENSSL_PATH)\inc32\openssl
92
-LINKLIB  = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\libeay32.lib
93
-!endif
94
-
95
-.autodepend
96
-
97
-.path.c   = $(SRCDIRS)
98
-.path.obj = $(OBJDIR)
99
-.path.int = $(OBJDIR)
100
-
101
-# Makefile.inc provides the CSOURCES and HHEADERS defines
102
-!include Makefile.inc
103
-
104
-CSOURCES = $(CURL_CFILES) $(CURLX_CFILES:../lib/=)
105
-OBJECTS  = $(CSOURCES:.c=.obj)
106
-PREPROCESSED = $(CSOURCES:.c=.int)
107
-
108
-# Borland's command line compiler (BCC32) version 5.5.1 integrated
109
-# preprocessor has a bug which results in silently generating wrong
110
-# definitions for libcurl macros such as CURL_OFF_T_C, on the other
111
-# hand Borland's command line preprocessor (CPP32) version 5.5.1 does
112
-# not have the bug and achieves proper results. In order to avoid the
113
-# silent bug we first preprocess source files and later compile the
114
-# preprocessed result.
115
-
116
-.c.obj:
117
-	@-$(RM) $(@R).int
118
-	$(PP_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$(@R).int $(<)
119
-	$(CC_CMD) $(CC_FLAGS) -o$(@) $(@R).int
120
-
121
-all:	$(OBJDIR) tool_hugehelp $(PROGNAME)
122
-
123
-clean:
124
-	cd $(OBJDIR)
125
-	@-$(RM) $(OBJECTS)
126
-	@-$(RM) $(PREPROCESSED)
127
-	cd ..
128
-	@-$(RMDIR) $(OBJDIR)
129
-	@-$(RM) $(PROGNAME)
130
-	@-$(RM) curl.tds
131
-
132
-$(OBJDIR):
133
-	@-$(RMDIR) $(OBJDIR)
134
-	@-$(MKDIR) $(OBJDIR)
135
-
136
-!ifdef WITH_ZLIB
137
-tool_hugehelp: ..\docs\MANUAL ..\docs\curl.1 mkhelp.pl
138
-        groff -Tascii -man -P -c ../docs/curl.1 > tool_hugehelp.tmp
139
-        perl -w mkhelp.pl -c ../docs/MANUAL < tool_hugehelp.tmp > tool_hugehelp.c
140
-	@-$(RM) tool_hugehelp.tmp
141
-!else
142
-tool_hugehelp:
143
-	if exist ..\GIT-INFO $(COPY) tool_hugehelp.c.cvs tool_hugehelp.c
144
-!endif
145
-
146
-$(PROGNAME): $(OBJECTS) $(LIBCURL_LIB) $(LINKLIB)
147
-	@-$(RM) $(PROGNAME)
148
-	$(LD) $(LDFLAGS) -e$@ @&&!
149
-$(**: = ^
150
-)
151
-!
152
-
153
-
154
-# End of Makefile.b32