From: Ivan Maidanski <ivmai@mail.ru>
Date: Thu, 31 May 2018 06:10:02 +0000 (+0300)
Subject: Cleanup BCC makefile (remove absolute GC paths, fix del cmd, update clean)
X-Git-Tag: v7.4.14~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab70525b80891b7ff48415b3db7e9458a1deadf7;p=gc

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 4e453346..ba08d7ac 100644
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -6,14 +6,13 @@ bcbin=	   $(bc)\bin
 bclib=	   $(bc)\lib
 bcinclude= $(bc)\include
 
-gcinclude1 = $(bc)\gc6.2\include
-gcinclude2 = $(bc)\gc6.2\cord
+gcinclude1 = .\include
 
 cc=	 $(bcbin)\bcc32
 rc=	 $(bcbin)\brc32
 lib=	 $(bcbin)\tlib
 link=	 $(bcbin)\ilink32
-cflags=  -O2 -R -v- -vi -H -H=gc.csm -I$(bcinclude);$(gcinclude1);$(gcinclude2) -L$(bclib) \
+cflags=  -O2 -R -v- -vi -H -H=gc.csm -I$(bcinclude);$(gcinclude1) -L$(bclib) \
 	 -w-pro -w-aus -w-par -w-ccc -w-rch -a4
 defines= -DALL_INTERIOR_POINTERS -DUSE_GENERIC -DNO_GETENV -DJAVA_FINALIZATION -DGC_OPERATOR_NEW_ARRAY
 
@@ -28,7 +27,7 @@ defines= -DALL_INTERIOR_POINTERS -DUSE_GENERIC -DNO_GETENV -DJAVA_FINALIZATION -
 |
 
 .rc.res:
-    $(rc) -i$(bcinclude) -r -fo$* $*.rc
+	$(rc) -i$(bcinclude) -r -fo$* $*.rc
 
 XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \
     XXXmach_dep.obj XXXos_dep.obj XXXmark_rts.obj XXXheaders.obj XXXmark.obj \
@@ -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
 
 gc.lib: $(OBJS)
-	del gc.lib
+	-del gc.lib
 	$(lib) $* @&&|
 	$(XXXOBJS:XXX=+)
 |
 
 gctest.exe: tests\test.obj gc.lib
-    $(cc) @&&|
+	$(cc) @&&|
 	$(cflags) -W -e$* tests\test.obj gc.lib
 |
 
@@ -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 \
 	cord\tests\de.obj cord\tests\de_win.obj gc.lib
 |
-    $(rc) cord\tests\de_win.res cord\de.exe
+	$(rc) cord\tests\de_win.res cord\de.exe
 
 gc_cpp.obj: include\gc_cpp.h include\gc.h
 
-gc_cpp.cpp: gc_cpp.cc
-	copy gc_cpp.cc gc_cpp.cpp
-
 test_cpp.cpp: tests\test_cpp.cc
 	copy tests\test_cpp.cc test_cpp.cpp
 
 test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib
-    $(cc) @&&|
+	$(cc) @&&|
 	$(cflags) -W -e$* test_cpp.obj gc.lib
 |
 
-scratch:
-    -del *.obj *.res *.exe *.csm cord\*.obj cord\*.res cord\*.exe cord\*.csm
-
 clean:
-      del gc.lib
-      del *.obj
-      del tests\test.obj
+	-del *.obj *.res *.exe *.csm cord\*.obj cord\*.res cord\*.exe cord\*.csm
+	-del *.log *.tds gc.lib tests\test.obj "gc.#0*"