# HG changeset patch
# User Tormod Volden <debian.tormod@gmail.com>
# Date 1373661678 -7200
# Node ID f2e92661b4c6daa764f2d5f79cc73f7e7e7b5e4e
# Parent  7e3422f5e25dfba9e0ea09d28f7c5eb816fe2054
Makefiles: Always use macro for lwar and rm

The LWAR macro is new, rm was still used in one place.

diff -r 7e3422f5e25d -r f2e92661b4c6 docs/os9sysprog/makefile
--- a/docs/os9sysprog/makefile	Fri Jul 12 22:32:54 2013 +0200
+++ b/docs/os9sysprog/makefile	Fri Jul 12 22:41:18 2013 +0200
@@ -10,7 +10,7 @@
 	 docbook2ps -d "$(STYLESHEET)#print" $(BOOK).docbook
 
 $(BOOK).html: $(BOOK).docbook $(STYLESHEET)
-	rm -f *.html
+	$(RM) *.html
 #	jade -t sgml -V html-index -d /usr/share/sgml/docbook/dsssl-stylesheets-1.64/html/docbook.dsl $(BOOK).docbook
 #	collateindex.pl -p -o index.docbook HTML.index
 	docbook2html -d "$(STYLESHEET)#html" $(BOOK).docbook
diff -r 7e3422f5e25d -r f2e92661b4c6 lib/alib/makefile
--- a/lib/alib/makefile	Fri Jul 12 22:32:54 2013 +0200
+++ b/lib/alib/makefile	Fri Jul 12 22:41:18 2013 +0200
@@ -42,7 +42,7 @@
 all:	../libalib.a
 
 ../libalib.a: $(MODS)
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 dskclean: clean
 
diff -r 7e3422f5e25d -r f2e92661b4c6 lib/makefile
--- a/lib/makefile	Fri Jul 12 22:32:54 2013 +0200
+++ b/lib/makefile	Fri Jul 12 22:41:18 2013 +0200
@@ -4,37 +4,37 @@
 	libcoco.a libcoco3.a libcoco3_6309.a libdragon.a libatari.a
 
 libnos96809l1.a: sys6809l1.o
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 libnos96809l2.a: sys6809l2.o
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 libnos96309l2.a: sys6309l2.o
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 libnet.a: net.o
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 libcoco.a: coco.o
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 libcoco3.a: coco3.o
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 libcoco3_6309.a: coco3_6309.o
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 libatari.a: atari.o
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 libdragon.a: dragon.o
-	lwar -c $@ $?
+	$(LWAR) $@ $?
 
 libalib.a:
-	cd alib; make
+	$(MAKE) -C alib
 
 dskcopy:
 
 clean:
 	$(RM) *.a *.o
-	cd alib; make clean
+	$(MAKE) -C alib clean
diff -r 7e3422f5e25d -r f2e92661b4c6 rules.mak
--- a/rules.mak	Fri Jul 12 22:32:54 2013 +0200
+++ b/rules.mak	Fri Jul 12 22:41:18 2013 +0200
@@ -55,6 +55,7 @@
 # RMA/RLINK
 ASM		= lwasm --6309 --format=obj --pragma=pcaspcr,condundefzero,undefextern,dollarnotlocal,export --includedir=.
 LINKER		= lwlink --format=os9
+LWAR		= lwar -c
 
 # Commands
 MAKDIR		= os9 makdir