From 64919ae255d7a62c5b59cda16d6f8b0f2e0a52a9 Mon Sep 17 00:00:00 2001
From: Tom Everett <tom@khubla.com>
Date: Sat, 5 Mar 2016 17:08:10 -0700
Subject: [PATCH] updated makefile

---
 Makefile | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index a5ac05b..346ee05 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-# Top level makefile to build the utilities etc,
+# Top level makefile to build the utilities etc
 AS=tools/as7
+ASARGS=--format=rim
 BINDIR=bin
 SYSDIR=$(BINDIR)/sys
 CMDDIR=$(BINDIR)/cmd
@@ -12,35 +13,35 @@ dirs:
 	mkdir -p $(CMDDIR)
 
 sys:
-	$(AS) -o $(SYSDIR)/kernel   src/sys/*.s
+	$(AS) $(ASARGS) -o $(SYSDIR)/kernel   src/sys/*.s
 
 cmd:
-#	$(AS) -o $(CMDDIR)/adm   src/cmd/adm.s
-#	$(AS) -o $(CMDDIR)/apr   src/cmd/apr.s
-	$(AS) -o $(CMDDIR)/as   src/cmd/as.s
-#	$(AS) -o $(CMDDIR)/bc   src/cmd/bc.s
-#	$(AS) -o $(CMDDIR)/bi   src/cmd/bi.s
-#	$(AS) -o $(CMDDIR)/bl   src/cmd/bl.s
-#	$(AS) -o $(CMDDIR)/cas   src/cmd/cas.s
-	$(AS) -o $(CMDDIR)/cat   src/cmd/cat.s
-#	$(AS) -o $(CMDDIR)/check    src/cmd/check.s
-	$(AS) -o $(CMDDIR)/chmod src/cmd/chmod.s
-	$(AS) -o $(CMDDIR)/chown src/cmd/chown.s
-	$(AS) -o $(CMDDIR)/chrm  src/cmd/chrm.s
-	$(AS) -o $(CMDDIR)/cp    src/cmd/cp.s
-#	$(AS) -o $(CMDDIR)/db    src/cmd/db.s
-#	$(AS) -o $(CMDDIR)/dmabs    src/cmd/dmabs.s
-	$(AS) -o $(CMDDIR)/ds    src/cmd/ds.s
-#	$(AS) -o $(CMDDIR)/dskio   src/cmd/dskio.s
-#	$(AS) -o $(CMDDIR)/dskres    src/cmd/dskres.s
-#	$(AS) -o $(CMDDIR)/dsksav    src/cmd/dsksav.s
-#	$(AS) -o $(CMDDIR)/dsw    src/cmd/dsw.s
-#	$(AS) -o $(CMDDIR)/ed1    src/cmd/ed1.s
-#	$(AS) -o $(CMDDIR)/ed2    src/cmd/ed2.s
-#	$(AS) -o $(CMDDIR)/init    src/cmd/init.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/adm   src/cmd/adm.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/apr   src/cmd/apr.s
+	$(AS) $(ASARGS) -o $(CMDDIR)/as   src/cmd/as.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/bc   src/cmd/bc.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/bi   src/cmd/bi.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/bl   src/cmd/bl.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/cas   src/cmd/cas.s
+	$(AS) $(ASARGS) -o $(CMDDIR)/cat   src/cmd/cat.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/check    src/cmd/check.s
+	$(AS) $(ASARGS) -o $(CMDDIR)/chmod src/cmd/chmod.s
+	$(AS) $(ASARGS) -o $(CMDDIR)/chown src/cmd/chown.s
+	$(AS) $(ASARGS) -o $(CMDDIR)/chrm  src/cmd/chrm.s
+	$(AS) $(ASARGS) -o $(CMDDIR)/cp    src/cmd/cp.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/db    src/cmd/db.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/dmabs    src/cmd/dmabs.s
+	$(AS) $(ASARGS) -o $(CMDDIR)/ds    src/cmd/ds.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/dskio   src/cmd/dskio.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/dskres    src/cmd/dskres.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/dsksav    src/cmd/dsksav.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/dsw    src/cmd/dsw.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/ed1    src/cmd/ed1.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/ed2    src/cmd/ed2.s
+#	$(AS) $(ASARGS) -o $(CMDDIR)/init    src/cmd/init.s
 
 others:
-	$(AS) -o $(CMDDIR)/ls  src/other/wktls.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/ls  src/other/wktls.s	
 
 clean:
 	rm -rf $(BINDIR)/*