Remove Borland-specific Makefile (BCC_MAKEFILE)

Issue #105 (bdwgc).

CMake script should be used instead of BCC_MAKEFILE.

* BCC_MAKEFILE: Remove file.
* Makefile.am (EXTRA_DIST): Remove BCC_MAKEFILE.
* doc/README.win32 (Borland Tools): Remove "rarely tested" note; change
BCC_MAKEFILE to cmake -G "Borland Makefiles"; remove note that
Borland 5.5 is assumed.

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
deleted file mode 100644 (file)
index 9ad4e29..0000000
--- a/BCC_MAKEFILE
+++ /dev/null
@@ -1,85 +0,0 @@
-# Makefile for Borland C++ 5.5 on NT\r
-#\r
-bc=       c:\Borland\BCC55\r
-bcbin=    $(bc)\bin\r
-bclib=    $(bc)\lib\r
-bcinclude= $(bc)\include\r
-\r
-gcinclude1 = .\include\r
-\r
-cc=     $(bcbin)\bcc32\r
-rc=     $(bcbin)\brc32\r
-lib=    $(bcbin)\tlib\r
-link=   $(bcbin)\ilink32\r
-cflags=  -O2 -R -v- -vi -H -H=gc.csm -I$(bcinclude);$(gcinclude1) -L$(bclib) \\r
-        -w-pro -w-aus -w-par -w-ccc -w-inl -w-rch -a4\r
-defines= -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION \\r
-     -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DJAVA_FINALIZATION \\r
-     -DGC_GCJ_SUPPORT -DGC_OPERATOR_NEW_ARRAY -DUSE_MUNMAP\r
-\r
-.c.obj:\r
-       $(cc) @&&|\r
-       $(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.c\r
-|\r
-\r
-.cpp.obj:\r
-       $(cc) @&&|\r
-       $(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.cpp\r
-|\r
-\r
-.rc.res:\r
-       $(rc) -i$(bcinclude) -r -fo$* $*.rc\r
-\r
-XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \\r
-    XXXmach_dep.obj XXXos_dep.obj XXXmark_rts.obj XXXheaders.obj XXXmark.obj \\r
-    XXXobj_map.obj XXXblacklst.obj XXXfinalize.obj XXXnew_hblk.obj \\r
-    XXXdbg_mlc.obj XXXmalloc.obj XXXdyn_load.obj \\r
-    XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj \\r
-    XXXfnlz_mlc.obj XXXgcj_mlc.obj\r
-\r
-OBJS= $(XXXOBJS:XXX=)\r
-\r
-all: gc.lib\r
-\r
-check: gctest.exe test_cpp.exe de.exe\r
-       gctest.exe\r
-       test_cpp.exe\r
-\r
-$(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h MAKEFILE\r
-\r
-gc.lib: $(OBJS)\r
-       -del gc.lib\r
-       $(lib) $* @&&|\r
-       $(XXXOBJS:XXX=+)\r
-|\r
-\r
-gctest.exe: tests\test.obj gc.lib\r
-       $(cc) @&&|\r
-       $(cflags) -W -e$* tests\test.obj gc.lib\r
-|\r
-\r
-cord\tests\de.obj cord\tests\de_win.obj: include\cord.h \\r
-    include\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h\r
-\r
-de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj \\r
-    cord\tests\de_win.obj cord\tests\de_win.res gc.lib\r
-       $(cc) @&&|\r
-       $(cflags) -W -e$* cord\cordbscs.obj cord\cordxtra.obj \\r
-       cord\tests\de.obj cord\tests\de_win.obj gc.lib\r
-|\r
-       $(rc) cord\tests\de_win.res de.exe\r
-\r
-gc_cpp.obj: gc_cpp.cc include\gc_cpp.h include\gc.h\r
-\r
-test_cpp.cpp: tests\test_cpp.cc\r
-       copy tests\test_cpp.cc test_cpp.cpp\r
-\r
-test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib\r
-       $(cc) @&&|\r
-       $(cflags) -W -e$* test_cpp.obj gc.lib\r
-|\r
-\r
-clean:\r
-       -del *.obj *.res *.exe *.csm cord\*.obj cord\*.res cord\*.exe cord\*.csm\r
-       -del cord\*.tds cord\tests\*.obj cord\tests\*.res\r
-       -del *.log *.tds gc.lib tests\test.obj "gc.#0*"\r

diff --git a/Makefile.am b/Makefile.am
index fc77933c73dae85498109ecdbceb09e17842a744..5d781d7dd2c055fafee60f48f0c6226ffd385291 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,8 +196,7 @@ EXTRA_DIST += README.QUICK
 
 # other makefiles
 # :GOTCHA: deliberately we do not include 'Makefile'
-EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
-    OS2_MAKEFILE PCR-Makefile digimars.mak \
+EXTRA_DIST += NT_MAKEFILE OS2_MAKEFILE PCR-Makefile digimars.mak \
     Makefile.direct SMakefile.amiga WCC_MAKEFILE autogen.sh CMakeLists.txt
 
 # files used by makefiles other than Makefile.am

diff --git a/doc/README.win32 b/doc/README.win32
index f05fb9c625a61879740df2afab8f08ecb485f1c2..7827fd1cd6da6d31f477330ed7274f9af2499d85 100644 (file)
--- a/doc/README.win32
+++ b/doc/README.win32
@@ -80,8 +80,7 @@ Memory unmapping could be turned off by "--disable-munmap" option.
 Borland Tools
 -------------
 
-[Rarely tested.]
-For Borland tools, use BCC_MAKEFILE.  Note that
+For Borland tools, use `cmake -G "Borland Makefiles"`.  Note that
 Borland's compiler defaults to 1 byte alignment in structures (-a1),
 whereas Visual C++ appears to default to 8 byte alignment (/Zp8).
 The garbage collector in its default configuration EXPECTS AT
@@ -91,8 +90,6 @@ I expect that -a1 introduces major performance penalties on a
 486 or Pentium.)  Note that this changes structure layouts.  (As a last
 resort, gcconfig.h can be changed to allow 1 byte alignment.  But
 this has significant negative performance implications.)
-The Makefile is set up to assume Borland 5.5.  If you have another
-version, change the line near the top.
 
 Digital Mars compiler
 ---------------------