Cleanup BCC makefile (remove absolute GC paths, fix del cmd, update clean)

(a cherry-pick of commit c9569216 from 'release-7_6')

* BCC_MAKEFILE (gcinclude1): Use relative path.
* BCC_MAKEFILE (gcinclude2): Remove.
* BCC_MAKEFILE (gc.lib, clean): Ignore errors of "del" command.
* BCC_MAKEFILE (gc_cpp.cpp, scratch): Remove rule.
* BCC_MAKEFILE (.rc.res, gctest.exe, cord\de.exe, test_cpp.exe): Use
tabs consistently.
* BCC_MAKEFILE (clean): Remove also *.log, *.tds, "gc.#0*" files, and
the ones which were specified for scratch rule.

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
index 4e45334606a82014b205cf762865c2c50c76ad7c..ba08d7acb161388a2e9974d84b125eca0ed0e84c 100644 (file)
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -6,14 +6,13 @@ bcbin=           $(bc)\bin
 bclib=    $(bc)\lib\r
 bcinclude= $(bc)\include\r
 \r
-gcinclude1 = $(bc)\gc6.2\include\r
-gcinclude2 = $(bc)\gc6.2\cord\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);$(gcinclude2) -L$(bclib) \\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-rch -a4\r
 defines= -DALL_INTERIOR_POINTERS -DUSE_GENERIC -DNO_GETENV -DJAVA_FINALIZATION -DGC_OPERATOR_NEW_ARRAY\r
 \r
@@ -28,7 +27,7 @@ defines= -DALL_INTERIOR_POINTERS -DUSE_GENERIC -DNO_GETENV -DJAVA_FINALIZATION -
 |\r
 \r
 .rc.res:\r
-    $(rc) -i$(bcinclude) -r -fo$* $*.rc\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
@@ -44,13 +43,13 @@ all: gctest.exe cord\de.exe test_cpp.exe
 $(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
+       -del gc.lib\r
        $(lib) $* @&&|\r
        $(XXXOBJS:XXX=+)\r
 |\r
 \r
 gctest.exe: tests\test.obj gc.lib\r
-    $(cc) @&&|\r
+       $(cc) @&&|\r
        $(cflags) -W -e$* tests\test.obj gc.lib\r
 |\r
 \r
@@ -63,25 +62,18 @@ cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj \
        $(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 cord\de.exe\r
+       $(rc) cord\tests\de_win.res cord\de.exe\r
 \r
 gc_cpp.obj: include\gc_cpp.h include\gc.h\r
 \r
-gc_cpp.cpp: gc_cpp.cc\r
-       copy gc_cpp.cc gc_cpp.cpp\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
+       $(cc) @&&|\r
        $(cflags) -W -e$* test_cpp.obj gc.lib\r
 |\r
 \r
-scratch:\r
-    -del *.obj *.res *.exe *.csm cord\*.obj cord\*.res cord\*.exe cord\*.csm\r
-\r
 clean:\r
-      del gc.lib\r
-      del *.obj\r
-      del tests\test.obj\r
+       -del *.obj *.res *.exe *.csm cord\*.obj cord\*.res cord\*.exe cord\*.csm\r
+       -del *.log *.tds gc.lib tests\test.obj "gc.#0*"\r