Merge pull request #38 from teverett/master

Various makefile changes

.gitignore

@@ -1 +1,4 @@
-bin
+/bin
+/sys
+/tests
+

Makefile

@@ -3,8 +3,9 @@ AS=tools/as7
 ASARGS=--format=ptr
 SYSDIR=sys
 CMDDIR=bin
+TESTDIR=tests
 
-all: sys cmd others
+all: sys cmd others tests
 
 runsh: all
 	cd bin && ../tools/a7out sh
@@ -12,6 +13,7 @@ runsh: all
 dirs:
 	mkdir -p $(SYSDIR)
 	mkdir -p $(CMDDIR)
+	mkdir -p $(TESTDIR)
 
 sys: dirs
 	$(AS) $(ASARGS) -o $(SYSDIR)/unix   src/sys/*.s
@@ -37,18 +39,39 @@ cmd: dirs
 #	$(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)/ed    src/cmd/ed2.s src/cmd/ed1.s
-#	$(AS) $(ASARGS) -o $(CMDDIR)/ed2    src/cmd/ed2.s
 #	$(AS) $(ASARGS) -o $(CMDDIR)/init    src/cmd/init.s
 
-others:
+others: dirs
-	$(AS) $(ASARGS) -o $(CMDDIR)/ls    src/other/wktls.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/sh    	src/other/pbsh.s	
-	$(AS) $(ASARGS) -o $(CMDDIR)/sh    src/other/pbsh.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/ops    	src/other/ops.s	
-	$(AS) $(ASARGS) -o $(CMDDIR)/stat  src/other/wktstat.s	
+
-	$(AS) $(ASARGS) -o $(CMDDIR)/mv    src/other/wktmv.s	
+# wkt apps
-	$(AS) $(ASARGS) -o $(CMDDIR)/ln    src/other/wktln.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/wktls    	src/other/wktls.s	
-	$(AS) $(ASARGS) -o $(CMDDIR)/date  src/other/wktdate.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/wktcat    	src/other/wktcat.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/wktcp    	src/other/wktcp.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/wktdate  	src/other/wktdate.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/wktln  	src/other/wktln.s
+	$(AS) $(ASARGS) -o $(CMDDIR)/wktls  	src/other/wktls.s		
+	$(AS) $(ASARGS) -o $(CMDDIR)/wktmv    	src/other/wktmv.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/wktopr    	src/other/wktopr.s	
+	$(AS) $(ASARGS) -o $(CMDDIR)/wktstat  	src/other/wktstat.s	
+
+tests: dirs
+	$(AS) $(ASARGS) -o $(TESTDIR)/decimal_out    	src/tests/decimal_out.s	
+	$(AS) $(ASARGS) -o $(TESTDIR)/fork_test    		src/tests/fork_test.s	
+	$(AS) $(ASARGS) -o $(TESTDIR)/octal_test    	src/tests/octal_test.s	
+	$(AS) $(ASARGS) -o $(TESTDIR)/testmul    		src/tests/testmul.s
+	$(AS) $(ASARGS) -o $(TESTDIR)/write_test    	src/tests/write_test.s
+
+runtests: tests
+	cd tests && ../tools/a7out decimal_out
+	cd tests && ../tools/a7out fork_test
+	cd tests && ../tools/a7out octal_test
+#	cd tests && ../tools/a7out testmul
+#	cd tests && ../tools/a7out write_test
 
 clean:
 	rm -rf $(SYSDIR)/*
 	rm -rf $(CMDDIR)/*
+	rm -rf $(TESTDIR)/*