From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 16 Jul 2019 07:16:04 +0000 (+0300)
Subject: Rename gc68060.lib to gc.lib, cord/cord68060.lib to cord.lib in SMakefile
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc6ebe4e0d176745831465fb9a288b37b93854e6;p=gc

Rename gc68060.lib to gc.lib, cord/cord68060.lib to cord.lib in SMakefile

This is to match the behavior of the CMake script.

* SMakefile.amiga (clean): Remove cord/*.lib, cord/*.lnk.
* SMakefile.amiga (gctest, cordtest, gc$(CPU).lib): Rename gc$(CPU).lib
to gc.lib.
* SMakefile.amiga (cordtest, cord/cord$(CPU).lib): Rename
cord/cord$(CPU).lib to cord.lib.
* SMakefile.amiga (cordtest): Use $(LINKER) instead of slink.
* SMakefile.amiga (cord.lib): Use $(LIBER) instead of oml.
* SMakefile.amiga (cord/cordbscs.o, cord/cordprnt.o, cord/cordxtra.o,
cord/cordtest.o): Use $(CC) instead of sc.
---

diff --git a/SMakefile.amiga b/SMakefile.amiga
index d34c7d66..eb8f0047 100644
--- a/SMakefile.amiga
+++ b/SMakefile.amiga
@@ -52,7 +52,7 @@ CSCOPT= $(OPT) DEFINE AMIGA IGNORE=100 IGNORE=161
 all: gctest setjmp_t cordtest
 
 clean:
-	delete *.lib gctest setjmp_t *.o *.lnk cord/*.o cord/*.lib cord/*.lnk cord/tests/*.o cordtest
+	delete *.lib gctest setjmp_t *.o *.lnk cord/*.o cord/tests/*.o cordtest
 	smake
 
 test: setjmp_t gctest cordtest
@@ -60,28 +60,28 @@ test: setjmp_t gctest cordtest
 	gctest
 	cordtest
 
-gctest: gc$(CPU).lib GCAmigaOS$(CPU).lib test.o
-	$(LINKER) LIB:c.o test.o TO gctest LIB gc$(CPU).lib LIB:sc.lib $(MATHLIB)
+gctest: gc.lib GCAmigaOS$(CPU).lib test.o
+	$(LINKER) LIB:c.o test.o TO gctest LIB gc.lib LIB:sc.lib $(MATHLIB)
 
 setjmp_t: setjmp_t.o gc.h
 	$(LINKER) LIB:c.o setjmp_t.o to setjmp_t lib LIB:sc.lib
 
-cordtest: cord/tests/cordtest.o cord/cord$(CPU).lib gc$(CPU).lib
-	slink LIB:c.o cord/tests/cordtest.o LIB $(MATHLIB) gc$(CPU).lib cord/cord$(CPU).lib LIB:sc.lib TO cordtest
+cordtest: cord/tests/cordtest.o cord.lib gc.lib
+	$(LINKER) LIB:c.o cord/tests/cordtest.o LIB $(MATHLIB) gc.lib cord.lib LIB:sc.lib TO cordtest
 
 
 #------------------LIBBING----------------------------
 
 OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dyn_load.o dbg_mlc.o malloc.o checksums.o typd_mlc.o ptr_chck.o mallocx.o fnlz_mlc.o
 
-gc$(CPU).lib: $(OBJS)
-	$(LIBER) gc$(CPU).lib r $(OBJS)
+gc.lib: $(OBJS)
+	$(LIBER) gc.lib r $(OBJS)
 
 
 COBJS = cord/cordbscs.o cord/cordprnt.o cord/cordxtra.o
 
-cord/cord$(CPU).lib: $(COBJS)
-	oml cord/cord$(CPU).lib r $(COBJS)
+cord.lib: $(COBJS)
+	$(LIBER) cord.lib r $(COBJS)
 
 #------------------COMPILING--------------------------
 
@@ -160,13 +160,13 @@ setjmp_t: tools/setjmp_t.c gc.h
 # cords:
 
 cord/cordbscs.o: cord/cordbscs.c
-	sc cord/cordbscs.c $(CSCOPT)
+	$(CC) cord/cordbscs.c $(CSCOPT)
 
 cord/cordprnt.o: cord/cordprnt.c
-	sc cord/cordprnt.c $(CSCOPT)
+	$(CC) cord/cordprnt.c $(CSCOPT)
 
 cord/cordxtra.o: cord/cordxtra.c
-	sc cord/cordxtra.c $(CSCOPT)
+	$(CC) cord/cordxtra.c $(CSCOPT)
 
 cord/tests/cordtest.o: cord/tests/cordtest.c
-	sc cord/tests/cordtest.c $(CSCOPT)
+	$(CC) cord/tests/cordtest.c $(CSCOPT)